Browse code

Release checklist - bump versions earlier

Bump both API and VERSION directly after the release
branch is created. All changes to master after that
are (by default) for the *next* release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/02/05 07:42:56
Showing 1 changed files
... ...
@@ -76,15 +76,25 @@ git cherry-pick <commit-id>
76 76
 ...
77 77
 ```
78 78
 
79
-### 2. Bump the API version on master
79
+### 2. Update the VERSION files and API version on master
80 80
 
81
-We don't want to stop contributions to master just because we are releasing. At
82
-the same time, now that the release branch exists, we don't want API changes to
83
-go to the now frozen API version.
81
+We don't want to stop contributions to master just because we are releasing.
82
+So, after the release branch is up, we bump the VERSION and API version to mark
83
+the start of the "next" release.
84 84
 
85
-Create a new entry in `docs/reference/api/` by copying the latest and
86
-bumping the version number (in both the file's name and content), and submit
87
-this in a PR against master.
85
+#### 2.1 Update the VERSION files
86
+
87
+Update the content of the `VERSION` file to be the next minor (incrementing Y)
88
+and add the `-dev` suffix. For example, after the release branch for 1.5.0 is
89
+created, the `VERSION` file gets updated to `1.6.0-dev` (as in "1.6.0 in the
90
+making").
91
+
92
+#### 2.2 Update API version on master
93
+
94
+We don't want API changes to go to the now frozen API version. Create a new
95
+entry in `docs/reference/api/` by copying the latest and bumping the version
96
+number (in both the file's name and content), and submit this in a PR against
97
+master.
88 98
 
89 99
 ### 3. Update CHANGELOG.md
90 100
 
... ...
@@ -490,14 +500,7 @@ echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:
490 490
 Again, get two maintainers to validate, then merge, then push that pretty
491 491
 blue button to delete your branch.
492 492
 
493
-### 24. Update the VERSION files
494
-
495
-Now that version X.Y.Z is out, time to start working on the next! Update the
496
-content of the `VERSION` file to be the next minor (incrementing Y) and add the
497
-`-dev` suffix. For example, after 1.5.0 release, the `VERSION` file gets
498
-updated to `1.6.0-dev` (as in "1.6.0 in the making").
499
-
500
-### 25. Rejoice and Evangelize!
493
+### 24. Rejoice and Evangelize!
501 494
 
502 495
 Congratulations! You're done.
503 496