summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-12 11:35:30 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-12 11:35:30 -0300
commit5dcb215617ac174aed4e346d21a9efc648f6ee45 (patch)
tree0222a08e842e9fb6eb09bc96fa17828cce933083 /docs
parentf4ca53c9c8ce3a0d3dac34c956be6899695498d0 (diff)
Change the order of the actions in the release.
With this change we are following more accurately: http://nvie.com/posts/a-successful-git-branching-model/ Also, we achieve a clean version in master. If we do the tag before the merge in master, then we would have an extra commit after the tagging, which causes version to be X.Y.Z-1-blah.
Diffstat (limited to 'docs')
-rw-r--r--docs/release_checklist.wiki6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index 273804c7..aa83b566 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -21,10 +21,10 @@
* [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order).
- See whatever has been introduced in changes/VERSION_COMPAT
- Reset changes/VERSION_COMPAT
+ * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master
+ * [ ] git checkout develop && git pull origin develop && git merge --no-ff release-X.Y.Z && git push origin develop
* [ ] git tag -s X.Y.Z (note the -s so that it's a signed tag) The message should be something like: Tag <package> version X.Y.Z
* [ ] git push origin X.Y.Z
- * [ ] git checkout master && git pull origin master && git merge release-X.Y.Z && git push origin master
- * [ ] git checkout develop && git pull origin develop && git merge release-X.Y.Z && git push origin develop
* [ ] Build and upload bundles
* [ ] Use the scripts under pkg/<os>/ to build the the bundles.
* [ ] Sign them with gpg -a --sign --detach-sign <path/to/bundle>
@@ -38,3 +38,5 @@
Notes
-----
(*) this checklist kindly borrowed from tahoe-lafs documentation =)
+
+For a good reference look at http://nvie.com/posts/a-successful-git-branching-model/