-
Notifications
You must be signed in to change notification settings - Fork 142
Release steps
Gordon Woodhull edited this page Jan 14, 2020
·
18 revisions
We use git flow in order to handle development branches and stable releases at the same time. You don't need to install git-flow (AVH Edition) to follow this model, but the extension is useful.
- Update
NEWS.md
- Check if
scripts/bootstrapR.sh
works, also with--mk-dist
-
git flow release start N.N
(orgit flow hotfix start N.N
). We typically useN.N
for major releases andN.N.N
for patches - Update
VERSION
in the release branch to the current release version - Update
Version
inrcloud.support/DESCRIPTION
- this takes the formN.N-N
- Update
VERSION
in the develop branch to the next release version +'-devel' - Fix, fix...
- Check in artifacts!
-
git flow release finish N.N
(orgit flow hotfix finish N.N
) -
git push
frommaster
anddevelop
git push --tags
Notes:
- We shouldn't maintain different versions of different files in different branches (except for
VERSION
itself). So, in particular,NEWS.md
should just mention what version each feature/fix is targeted for, not what branch it was committed to. - Everything that gets committed to the release branch will get merged both to
master
anddevelop
. In principle,master
should always cleanly merge todevelop
(except forVERSION
).