Release steps

Jump to bottom Edit New page

gordonwoodhull edited this page Sep 5, 2014 · 4 revisions

Because I always forget something...

Update NEWS.md
Check if scripts/mkdist.sh and scripts/bootstrapR.sh still work
git flow release start N.N (or git flow hotfix start N.N)
Update VERSION in the release branch to the current release version
Update VERSION in the develop branch to the next release version +'-devel'
Fix, fix...
git flow release finish N.N (or git flow hotfix finish N.N)
git push from master and develop
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 and develop. In principle, master should always cleanly merge to develop (except for VERSION).