From 865447cf1637fa413056c4ed0c52a6816eb5d0a4 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 16:44:53 +0300 Subject: [PATCH 1/2] 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 From 73859c9cf3ab2e312afdfd53f271171f4483e1af Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 16:45:20 +0300 Subject: [PATCH 2/2] Incrementing version number to 0.0.4 --- CHANGELOG.md | 7 +++++++ VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b4375d..c1a7d95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.0.4 (2016-08-04) + - 865447cf1637fa413056c4ed0c52a6816eb5d0a4 2016-08-04 | Minor changes to make sure nothing strange happens when releasing (HEAD -> release-0.0.4, develop) [Ismo Vuorinen] + - f58d1c50ddc441665adc100912455f95bba21d61 2016-08-04 | Merge branch 'release-0.0.3' (tag: 0.0.3, master) [Ismo Vuorinen] + - 6bc0934eee3ce77a09aaa0f91528d9febc871dde 2016-08-04 | Merge branch 'release-0.0.3' into develop [Ismo Vuorinen] + - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2) [Ismo Vuorinen] + - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen] + ## 0.0.3 (2016-08-04) - c23b512b808fda4c2cc9edf9f618061a553c61a6 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen] - e4f313a05698acdb55ec30538eab0477b26c0063 2016-08-04 | Add missing changelog file [Ismo Vuorinen] diff --git a/VERSION b/VERSION index bcab45a..81340c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.3 +0.0.4