Merge "update the branching script to include a semver bump"
This commit is contained in:
commit
ca7e84e7cc
|
@ -36,7 +36,17 @@ cd $REPO
|
||||||
|
|
||||||
NEW_BRANCH="stable/$SERIES"
|
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())")
|
titlebranch=$(python -c "print('$SERIES'.title())")
|
||||||
cat - > releasenotes/source/${SERIES}.rst <<EOF
|
cat - > releasenotes/source/${SERIES}.rst <<EOF
|
||||||
===================================
|
===================================
|
||||||
|
|
|
@ -72,8 +72,8 @@ if [[ $NEW_BRANCH =~ stable/ ]]; then
|
||||||
series=$(echo $NEW_BRANCH | cut -f2 -d/)
|
series=$(echo $NEW_BRANCH | cut -f2 -d/)
|
||||||
if [[ -d releasenotes/source ]]; then
|
if [[ -d releasenotes/source ]]; then
|
||||||
# Also update the reno settings, in master, to add the new
|
# Also update the reno settings, in master, to add the new
|
||||||
# series page.
|
# series page and bump the SemVer value for feature work.
|
||||||
echo "Updating reno"
|
echo "Updating reno and semver"
|
||||||
git checkout master
|
git checkout master
|
||||||
$TOOLSDIR/add_release_note_page.sh $series .
|
$TOOLSDIR/add_release_note_page.sh $series .
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue