summaryrefslogtreecommitdiff
path: root/docs/release_checklist.wiki
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-20 17:28:25 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-20 17:28:25 -0300
commit1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 (patch)
tree8d96c7a374c91699c55fb8c5b609aac222a94e74 /docs/release_checklist.wiki
parent9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff)
parent222ce2a1513a3776b3277ded365672d7d43ad2e4 (diff)
Merge branch 'release-0.3.3'
Conflicts: pkg/requirements.pip setup.py src/leap/bitmask/config/leapsettings.py
Diffstat (limited to 'docs/release_checklist.wiki')
-rw-r--r--docs/release_checklist.wiki24
1 files changed, 13 insertions, 11 deletions
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index e6467048..19a19289 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -2,12 +2,12 @@
* [ ] Check that all tests are passing!
* [ ] Tag everything
* Should be done for the following packages, in order:
- 1. leap.common
- 2. leap.keymanager
- 3. leap.soledad
- 4. leap.mail
- 5. leap.bitmask
- 6. leap.mx
+ * [ ] 1. leap.common
+ * [ ] 2. leap.keymanager
+ * [ ] 3. leap.soledad
+ * [ ] 4. leap.mail
+ * [ ] 5. leap.bitmask
+ * [ ] 6. leap.mx
* NOTE: It's assumed that origin is the leap.se repo
* [ ] git fetch origin
* [ ] git tag -l, and see the latest tagged version (unless it's not a minor version bump, in which case, just bump to it)
@@ -17,17 +17,17 @@
- Helper bash line: for i in $(ls changes); do cat changes/$i; echo; done
* [ ] Update relnotes.txt if needed.
* [ ] git rm changes/*
- * [ ] git commit -av
* [ ] 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 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 commit -av # we should add a commit message here...
+ * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master
+ * [ ] git tag -s X.Y.Z -m "Tag <package> version X.Y.Z" # (note the -s so that it's a signed tag and -m to specify the message for the tag)
* [ ] 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
+ * [ ] git checkout develop && git merge master && git push origin develop
* [ ] Build and upload bundles
* [ ] Use the scripts under pkg/<os>/ to build the the bundles.
- * [ ] Sign them with gpg -a <path/to/bundle>
+ * [ ] Sign them with gpg -a --sign --detach-sign <path/to/bundle>
* [ ] Upload bundle and signature to web-uploads@salmon.leap.se:~/public/client/<os>/Bitmask-<os>-<ver>.(tar.bz2,dmg,zip)
* [ ] Update symbolic link for latest upload and signature:
* [ ] ~/public/client/Bitmask-<os>-latest
@@ -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/