...
Push Release Branch to develop and Maintenance
The release branch has changes made since code freeze. It also contains the update to the version numbers for future development.
...
Ensure that your commit history matches the release branch's commit history, except for the two additional commits.
- Changing from SNAPSHOT version to release version. Something like [maven-release-plugin] prepare release $REPO-$CURR
- Changing from release version to next development version. Something like [maven-release-plugin] prepare for next development iteration
If this appears correct, you can push your release branch on to the maintenance branch.
...
| Code Block |
|---|
git checkout develop
git pull
git checkout rel-${CURR}-RC
git rebase -i develop
git push origin develop |
Clean-up RC Tags
| Code Block |
|---|
#Examples
#For vivo, vitro, vivo languages, vitro languages
git tag #view list of tags to verify
git tag -d rel-1.10.0-RC-1
git push origin :refs/tags/rel-1.10.0-RC-1
#For jenatools
git tag #view list of tags to verify
git tag -d rel-1.2.0-RC-1
git push origin :refs/tags/rel-1.2.0-RC-1
#For orcid-api-client-0.6.3
git tag #view list of tags to verify
git tag -d rel-0.6.3-RC-1
git push origin :refs/tags/rel-0.6.3-RC-1 |
Close the release in Jira, and create the next one
...