Permalink
Browse files

Add git release instructions to Checklist

  • Loading branch information...
ssm committed Jun 8, 2012
1 parent a79c925 commit bff2166f81b76ad83f7d8b6aceda752399f7c40a
Showing with 35 additions and 4 deletions.
  1. +35 −4 Checklist
View
@@ -21,14 +21,45 @@ This is a pre-release checklist for the maintainer.
svn --verbose log -r910:1234 | fgrep node.d | grep -w A |
cut -d/ -f 4- | sed s'/(.*//' | xargs ls -ld >/dev/null
+
+# Git release
+
+ We follow the workflow documented at
+ http://nvie.com/posts/a-successful-git-branching-model/
+
+ The tag used here is "2.0.1", exchange this with a current version.
+
+ * Create release branch from "devel"
+
+ git checkout -b release-2.0.1 devel
+
* Update ChangeLog
- * cd ..; svn cp svn://janl@munin-monitoring.org/munin/trunk \
- svn://janl@munin-monitoring.org/munin/tags/1.3.4
+ $EDITOR Changelog
+ git commit -m 'Update changelog for release' -- ChangeLog
+
+ * Merge release branch to master
+
+ git checkout master
+ git merge --no-ff release-2.0.1
+
+ (handle any conflicts, and "git commit" the result)
+
+ * Tag on master
+
+ git tag -a -s -m 'Release 2.0.1' 2.0.1 master
+
+ * Merge the release branch back to devel
+
+ git checkout devel
+ git merge --no-ff release-2.0.1
+
+# Make tarball from tag
- * Update RELEASE in the tag
+ git checkout 2.0.1
+ make tar
- * make tar
+# Propaganda
* Broadcast the good news:
1. make a sha256sum : sha256sum munin-version.tar.gz > munin-version.tar.gz.sha256sum

0 comments on commit bff2166

Please sign in to comment.