summaryrefslogtreecommitdiff
path: root/development.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'development.mdwn')
-rw-r--r--development.mdwn19
1 files changed, 17 insertions, 2 deletions
diff --git a/development.mdwn b/development.mdwn
index cf969fe..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -37,12 +37,25 @@ These steps should be run once in a while to ensure we have an up to date packag
DIST=sid sudo cowbuilder --update
+Coding standards
+----------------
+
+ - 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 master branch
+Go to develop branch and start a new release
- git checkout master
+ git checkout develop
+ git flow release start VERSION
Prepare the source code:
@@ -52,6 +65,8 @@ Prepare the source code:
Create and upload a new release:
+ git flow release finish $VERSION
+ git checkout master
make release
Update the debian branch: