summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-12 23:20:45 +0200
committerKali Kaneko <kali@leap.se>2013-09-12 23:20:45 +0200
commit87516c8e913f91c546b87cfa26d2d12a1d90be7c (patch)
tree1bba7513f413c996dcdc61f65e9b0b23f883518a
parent12f09bfeb715f024c232630878c6d330c759ef86 (diff)
parentfd697344cb39bd7b5a53e8e8b83ab7c78e1ef5ed (diff)
Merge remote-tracking branch 'ivan-github/feature/improve-git-release-workflow' into develop
-rw-r--r--docs/release_checklist.wiki4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index e6513f90..b12a42a4 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -22,9 +22,9 @@
- 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 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 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 --sign --detach-sign <path/to/bundle>