From 865447cf1637fa413056c4ed0c52a6816eb5d0a4 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 16:44:53 +0300 Subject: [PATCH] Minor changes to make sure nothing strange happens when releasing --- release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 9aafae8..7070669 100755 --- a/release.sh +++ b/release.sh @@ -121,6 +121,9 @@ echo -e "$ADJUSTMENTS_MSG" read echo -e "$PUSHING_MSG" +# Make sure changes have been added +git add $FILE_VERSION $FILE_CHANGELOG + # Commit version number increment git commit -am "Incrementing version number to $NEW_VERSION" @@ -129,7 +132,7 @@ git checkout $BRANCH_MASTER git merge --no-ff $BRANCH_RELEASE # 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 git checkout $BRANCH_DEV