update the branching script to include a semver bump
We want to ensure that the version numbers on master are always higher than the version numbers on stable branches. We can do that by including an instruction in the commit message for the patch that adds the reno documentation build file when a branch is created. We use "feature" because we just need to bump the version enough to ensure it doesn't conflict with the stable branch but do not want to force new versions that make it appear the new release will be incompatible. Change-Id: I99f7e3858e94ac3bdc5780945e941db6e9b2bba9 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
parent
6225aa1cd2
commit
d919755370
@ -36,7 +36,17 @@ cd $REPO
|
||||
|
||||
NEW_BRANCH="stable/$SERIES"
|
||||
|
||||
commit_msg="Update reno for $NEW_BRANCH"
|
||||
commit_msg="Update master for $NEW_BRANCH
|
||||
|
||||
Add file to the reno documentation build to show release notes for
|
||||
$NEW_BRANCH.
|
||||
|
||||
Use pbr instruction to increment the minor version number
|
||||
automatically so that master versions are higher than the versions on
|
||||
$NEW_BRANCH.
|
||||
|
||||
Sem-Ver: feature
|
||||
"
|
||||
titlebranch=$(python -c "print('$SERIES'.title())")
|
||||
cat - > releasenotes/source/${SERIES}.rst <<EOF
|
||||
===================================
|
||||
|
@ -72,8 +72,8 @@ if [[ $NEW_BRANCH =~ stable/ ]]; then
|
||||
series=$(echo $NEW_BRANCH | cut -f2 -d/)
|
||||
if [[ -d releasenotes/source ]]; then
|
||||
# Also update the reno settings, in master, to add the new
|
||||
# series page.
|
||||
echo "Updating reno"
|
||||
# series page and bump the SemVer value for feature work.
|
||||
echo "Updating reno and semver"
|
||||
git checkout master
|
||||
$TOOLSDIR/add_release_note_page.sh $series .
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user