In this document:
W=Y-1), could be X.W.B if prior release was a bugfix.
To commence a standard release (not a bugfix or hotfix) of the Serval Mesh app for Android:
Senior developers should investigate whether the prior release was actually published:
In an up-to-date Git clone of the Batphone GitHub repository, the following command will reveal whether the Batphone Git master branch has been merged into the Batphone Git development branch:
$ git branch --remotes --merged origin/development origin/HEAD -> origin/development origin/development origin/master $
If origin/master does not appear in the output, then it has not been merged. The last release process was not finished properly. Follow the instructions in Finish the release process to perform the merge.
$ git checkout development Switched to branch 'development' $ git reset --hard origin/development HEAD is now at hHhHhHh This is the last commit comment before releasing version X.Y $
Most of the work in this step should already have been done, provided that the Batphone Git development branch housekeeping and Prepare for release tasks were properly carried out. If not, the release developer will either have to do all the work or delegate the work.
In up-to-date Batphone Git development branch (from the step above):
RELEASE-X.W.md), and edited to fix relative links:
Commit and push the changes:
$ git branch a-branch-name * development master another-branch-name $ git status --short ?? doc/RELEASE-X.W.md M CONTRIBUTORS.md M CURRENT-RELEASE.md M README.md $ git add . $ git status --short A doc/RELEASE-X.W.md M CONTRIBUTORS.md M CURRENT-RELEASE.md M README.md $ git commit -m 'Update Release Notes, README and CONTRIBUTORS ready for release X.Y' [development hHhHhHh] Update Release Notes, README and CONTRIBUTORS ready for release X.Y 3 files changed, NN insertions(+), NN deletions(-) create mode 100644 doc/RELEASE-X.W.md $ git push --quiet $
In an up-to-date Git clone of the Batphone GitHub repository, use the following commands to create a release branch from the HEAD of the Batphone Git development branch (where X.Y is the version of the release being performed):
$ git branch --no-track release-X.Y origin/development $ git push --set-upstream origin release-X.Y Total 0 (delta 0), reused 0 (delta 0) To firstname.lastname@example.org:servalproject/batphone.git * [new branch] release-X.Y -> release-X.Y Branch release-X.Y set up to track remote branch release-X.Y from origin. $