OneStop is a data discovery system being built by CIRES researchers on a grant from the NOAA National Centers for Environmental Information. We welcome contributions from the community!
This project is maintained by cedardevs
Estimated Reading Time: 5 minutes
These instructions assume the hotfix is a single commit, with changes that should be applied to both the current release branch and master. The git commands can be altered to handle multiple commits, but this is left as an exercise to the reader. If the change should not be applied, or differs between the two branches, just manually create two separate changes for each branch instead.
manageVersions.sh
, and commit it.git log
(on branch A) to look up the hash for the commit. In later instructions, this will be referred to as HASH.git format-patch -1 HASH
(on branch A) to generate a patch file. It will be named something like 0001-commit-message.patch
git apply 0001-commit-message.patch
to apply the changes.Note that it doesn’t make any difference if the patch is written on master and then applied to the release branch, or the reverse.
For example:
git checkout release/2.x
edit build.gradle
manageVersions.sh GET
manageVersions.sh SET 2.x.<p+1>
manageVersions.sh GET #confirm desired changes
git add .
git commit -m "test"
git format-patch -1 HASH
git checkout master
git apply 0001-test.patch
git add .
git commit -m "test"
Once a hotfix and incremented patched version number has been merged to the release branch, tag it.
git tag <tag>
git push origin <tag>
Write the release notes on GitHub:
master
branch.(export DOCKER_USER=<user>; export DOCKER_PASSWORD=<password>; ./gradlew jib)