From f621aa0bbfb34910136afdea6ed5cd217bdeaff2 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 16 May 2014 16:56:53 -0300 Subject: Release workflow with git-flow (2) --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') 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 -- cgit v1.2.3