mirror of
https://github.com/superhelio/tools.git
synced 2026-01-26 03:14:00 +00:00
Minor changes to make sure nothing strange happens when releasing
This commit is contained in:
@@ -121,6 +121,9 @@ echo -e "$ADJUSTMENTS_MSG"
|
|||||||
read
|
read
|
||||||
echo -e "$PUSHING_MSG"
|
echo -e "$PUSHING_MSG"
|
||||||
|
|
||||||
|
# Make sure changes have been added
|
||||||
|
git add $FILE_VERSION $FILE_CHANGELOG
|
||||||
|
|
||||||
# Commit version number increment
|
# Commit version number increment
|
||||||
git commit -am "Incrementing version number to $NEW_VERSION"
|
git commit -am "Incrementing version number to $NEW_VERSION"
|
||||||
|
|
||||||
@@ -129,7 +132,7 @@ git checkout $BRANCH_MASTER
|
|||||||
git merge --no-ff $BRANCH_RELEASE
|
git merge --no-ff $BRANCH_RELEASE
|
||||||
|
|
||||||
# Create tag for new version from -master
|
# Create tag for new version from -master
|
||||||
git tag $NEW_VERSION
|
git tag -am "Tag version ${NEW_VERSION}." "$NEW_VERSION"
|
||||||
|
|
||||||
# Merge release branch with the new version number back into develop
|
# Merge release branch with the new version number back into develop
|
||||||
git checkout $BRANCH_DEV
|
git checkout $BRANCH_DEV
|
||||||
|
|||||||
Reference in New Issue
Block a user