This project uses the successful git branching model and sticks closely to semantic versioning.
- Branch off develop e.g.
git checkout develop && git checkout -b hotfix-0.3.1
- Delete develop.md
- Bump version number in setup.py and rpcalc.py
- Make sure that no
## __NEXT RELEASE__
section exists inchangelog.md
. - Commit and push.
git commit -am 'readied hotfix 0.3.1' && git push
After a release or hotfix branch is prepared, the following tasks will properly release the next version.
Remember to force git merge
not to fast forward!
- Merge changes to master e.g.
git checkout master && git merge --no-ff hotfix-0.3.1
. - Tag the release on master. Use an annotated tag with the name
v
followed by the semantic version number e.g.git tag -a v0.3.1 -m 'squashes trig bugs'
. - Push.
git push
- Merge changes to develop e.g.
git checkout develop && git merge --no-ff hotfix-0.3.1
. - Prepare develop for further development e.g.
git checkout origin/develop develop.md
; add## __NEXT RELEASE__
to changelog.md - Commit and push.
git commit -am 'readied for further development' && git push
- Delete the release/hotfix branch locally and remotely e.g.
git branch -d hotfix-0.3.1
git push origin :hotfix-0.3.1
- Push with
git push
andgit push --tags
. - Write some release notes in the releases section on GitHub. Flag a pre-release if it is necessary.
- Go to the GitHub page generator, hit Load README.md. Hit Continue to Layouts, choose the Leap Day theme, and hit Publish.
- update PKGBUILD if necessary
- burp upload PKGBUILD with
burp -u qguv -c science rpc<Tab>