...
Code Block |
---|
git clone git@github.com:$ORG/$REPO.git cd $REPO git checkout rc-$CURR-b ${CURR}-RC origin/${CURR}-RC # or the RCrelease branch if named differently mvn release:clean |
If release:clean fails, you may need to revert the RC commit with git revert HEAD
. If the parent snapshot is not available, build an old version of fcrepo4 to populate it locally.
...
Note | |||||||
---|---|---|---|---|---|---|---|
Your GPG passphrase may not be masked in terminal.
|
Inspect/Verify local updates:
Code Block |
---|
git diff HEAD~1 git diff HEAD~2 HEAD~1 |
These diffs should only contain changes of version numbers (from ${CURR}-SNAPSHOT to $CURR or $CURR to $NEXT) or occasionally HEAD to the current tag name ($REPO-$CURR)
Remove your local copies of Fedora artifacts to be sure of a clean build, and build the release.
...
Note | |||||||
---|---|---|---|---|---|---|---|
As before, your GPG passphrase may not be masked in terminal.
|
Warning | ||
---|---|---|
| ||
The following steps, once completed are final. They cannot be undone, revoked or altered. Only proceed if you've completed all the above steps and are absolutely certain the release is ready for publication. |
...
Expand | |||||||
---|---|---|---|---|---|---|---|
|
Merge With Master
|
Push Release Branch to Master
The release branch has changes made since code freeze. It also contains the update to Merge the release into the master branch to update the version numbers for future development.
Code Block |
---|
git checkout master${CURR}-RC # this is your local copy of the release branch git log |
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 master.
Code Block |
---|
merge rc-$CURR git push origin ${CURR}-RC:master |
Info |
---|
Because there are no changes to master after code freeze and all bug fixes are on the ${CURR}-RC branch, this will operate as a fast-forward merge. |
Merge DEV branch into master
Process TBD
Complete the Duraspace wiki documentation updates
...