summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:56:53 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:56:53 -0300
commitf621aa0bbfb34910136afdea6ed5cd217bdeaff2 (patch)
tree1aabcce28ace7b2b5fe1c6f02e14e67526da4eb0
parent2d5facf273018bdef3fe442a64346b24cff631dc (diff)
downloadkeyringer-f621aa0bbfb34910136afdea6ed5cd217bdeaff2.tar.gz
keyringer-f621aa0bbfb34910136afdea6ed5cd217bdeaff2.tar.bz2
Release workflow with git-flow (2)
-rw-r--r--Makefile5
-rw-r--r--development.mdwn3
2 files changed, 4 insertions, 4 deletions
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: