diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-11-09 10:22:20 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-11-09 10:22:20 -0200 |
| commit | 232c85ea9323771b09cad4b2363498f7534989fe (patch) | |
| tree | 12339fea83da2d359131a53a657ccc8ecbd9ff99 /Makefile | |
| parent | 29d1d44e723441d76cd5a426b94c9e0d0feef01b (diff) | |
| parent | dc4c62e5bffc41a3a128440341078de9075bd856 (diff) | |
| download | keyringer-232c85ea9323771b09cad4b2363498f7534989fe.tar.gz keyringer-232c85ea9323771b09cad4b2363498f7534989fe.tar.bz2 | |
Merge branch 'develop'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -64,8 +64,9 @@ release: # https://github.com/nvie/gitflow/pull/160 # https://github.com/nvie/gitflow/issues/50 #git flow release finish -s -m "Keyringer $(VERSION)" $(VERSION) - git flow release finish -s $(VERSION) + #git flow release finish -s $(VERSION) git checkout master + git merge develop @make tarball gpg --use-agent --armor --detach-sign --output $(ARCHIVE)/keyringer-$(VERSION).tar.bz2.asc $(ARCHIVE)/keyringer-$(VERSION).tar.bz2 scp $(ARCHIVE)/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/ @@ -81,3 +82,11 @@ debian: dch -e git commit -a -m "Updating debian/changelog" git-buildpackage --git-tag-only --git-sign-tags + +web: + @ikiwiki --setup ikiwiki.setup + +web_deploy: + @rsync -avz --delete www/ blog:/var/sites/keyringer/www/ + +publish: web web_deploy |