aboutsummaryrefslogtreecommitdiff
path: root/development.mdwn
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:22:20 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:22:20 -0200
commit232c85ea9323771b09cad4b2363498f7534989fe (patch)
tree12339fea83da2d359131a53a657ccc8ecbd9ff99 /development.mdwn
parent29d1d44e723441d76cd5a426b94c9e0d0feef01b (diff)
parentdc4c62e5bffc41a3a128440341078de9075bd856 (diff)
downloadkeyringer-232c85ea9323771b09cad4b2363498f7534989fe.tar.gz
keyringer-232c85ea9323771b09cad4b2363498f7534989fe.tar.bz2
Merge branch 'develop'
Diffstat (limited to 'development.mdwn')
-rw-r--r--development.mdwn14
1 files changed, 7 insertions, 7 deletions
diff --git a/development.mdwn b/development.mdwn
index 670dcbd..49a224c 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -8,20 +8,16 @@ Index
Coding standards
----------------
+* Uses Semantic Versioning.
* Respect the existing coding style.
* Be clear: easy audability must be one of keyringer's requirements.
-Development workflow
---------------------
-
-We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
-
Release workflow
----------------
Go to develop branch and start a new release
- git flow release start VERSION
+ git checkout develop
Prepare the source code:
@@ -33,6 +29,10 @@ Create and upload a new release:
make release
+Tag the release:
+
+ git tag -s $(VERSION) -m "Keyringer $(VERSION)"
+
Update the debian branch:
make debian
@@ -74,7 +74,7 @@ Test environment
Setup:
- keyringer test init ~/code/tests/keyringer
+ keyringer test init ~/temp/tests/keyringer
Teardown: