Commit f89df5b4 authored by dosire's avatar dosire

Do not branch from master until release is done.

parent 2adbc0b7
...@@ -58,12 +58,13 @@ Check if changed since last release (~22nd of last month depending on when last ...@@ -58,12 +58,13 @@ Check if changed since last release (~22nd of last month depending on when last
After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows: After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows:
* 17th: feature freeze (branch and stop merging new features) * 17th: feature freeze (stop merging new features in master)
* 18th: UI freeze (stop cherry-picking changes to the user interface) * 18th: UI freeze (stop merging changes to the user interface)
* 19th: code freeze (stop cherry-picking non-essential code improvements) * 19th: code freeze (stop merging non-essential code improvements)
* 20th: release candidate 1 (tag and tweet about x.x.rc1) * 20th: release candidate 1 (VERSION x.x.0.pre, tag and tweet about x.x.0.rc1)
* 21st: release candidate 2 (optional, only if rc1 had problems) * 21st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems)
* 22nd: release (update VERSION and CHANGELOG, tag, blog and tweet) * 22nd: release (VERSION x.x.0, create x-x-stable branch, tag, blog and tweet)
* 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems)
# Write a blog post # Write a blog post
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment