From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 May 2014 19:56:53 +0000 (-0300)
Subject: Release workflow with git-flow (2)
X-Git-Tag: 0.3.5^2~3
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f621aa0bbfb34910136afdea6ed5cd217bdeaff2;p=keyringer.git

Release workflow with git-flow (2)
---

diff --git a/Makefile b/Makefile
index 42f6d9b..c94a4b9 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,12 @@ tarball:
 release:
 	@make build_man
 	git commit -a -m "Keyringer $(VERSION)"
+	git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION)
+	git checkout master
 	@make tarball
 	gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2
 	scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/
 	# We're doing tagging afterwards:
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375
-	git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+	#git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+	git checkout develop
diff --git a/development.mdwn b/development.mdwn
index 67c6456..3857b3a 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -54,7 +54,6 @@ Release workflow
 
 Go to develop branch and start a new release
 
-    git checkout develop
     git flow release start VERSION
 
 Prepare the source code:
@@ -65,8 +64,6 @@ Prepare the source code:
 
 Create and upload a new release:
 
-    git flow release finish $VERSION
-    git checkout master
     make release
 
 Update the debian branch: