aboutsummaryrefslogtreecommitdiff
path: root/development.mdwn
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:46:54 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:46:54 -0300
commiteae903f8a412ced8dfa0454b658f0305eb1971f7 (patch)
tree26ed0eb9ab0ff54a70d6252dd35ca7f7e5cb5e6a /development.mdwn
parent778cab6307cf870d7913aea9a2afcdb68594155e (diff)
parent4edea3d52e0c04651508fba9bae6ed0d81ccaa01 (diff)
downloadkeyringer-eae903f8a412ced8dfa0454b658f0305eb1971f7.tar.gz
keyringer-eae903f8a412ced8dfa0454b658f0305eb1971f7.tar.bz2
Merge branch 'release/0.3.4'
Diffstat (limited to 'development.mdwn')
-rw-r--r--development.mdwn14
1 files changed, 12 insertions, 2 deletions
diff --git a/development.mdwn b/development.mdwn
index 957a7f8..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -37,6 +37,13 @@ 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
--------------------
@@ -45,9 +52,10 @@ 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:
@@ -57,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: