8 Commits
0.0.3 ... 0.0.5

Author SHA1 Message Date
Ismo Vuorinen
bea29b3ce3 Merge branch 'release-0.0.5' 2016-08-04 16:58:10 +03:00
Ismo Vuorinen
7514595f35 Incrementing version number to 0.0.5 2016-08-04 16:58:10 +03:00
Ismo Vuorinen
9ac3cdf1f2 Final message to show we are done 2016-08-04 16:54:38 +03:00
Ismo Vuorinen
f8af60b6b1 Merge branch 'release-0.0.4' 2016-08-04 16:45:20 +03:00
Ismo Vuorinen
5d09d34489 Merge branch 'release-0.0.4' into develop 2016-08-04 16:45:20 +03:00
Ismo Vuorinen
73859c9cf3 Incrementing version number to 0.0.4 2016-08-04 16:45:20 +03:00
Ismo Vuorinen
865447cf16 Minor changes to make sure nothing strange happens when releasing 2016-08-04 16:44:53 +03:00
Ismo Vuorinen
6bc0934eee Merge branch 'release-0.0.3' into develop 2016-08-04 16:41:17 +03:00
3 changed files with 14 additions and 7 deletions

View File

@@ -1,13 +1,15 @@
## 0.0.5 (2016-08-04)
- 9ac3cdf1f2ad87a24756614369b6911e4232ac0d 2016-08-04 | Final message to show we are done (HEAD -> release-0.0.5, origin/develop, develop) [Ismo Vuorinen]
## 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]
## 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]
- f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2, master) [Ismo Vuorinen]
- dd0341cb923241bca5e02d4b4d1a894708cf804b 2016-08-04 | Merge branch 'release-0.0.2' into develop [Ismo Vuorinen]
- f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen]
## 0.0.2 (2016-08-04)
- f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1, master) [Ismo Vuorinen]
- 997beeebb0ba05c60590ecf96cb18fc1e58a336a 2016-08-04 | Merge branch 'release-0.0.1' into develop (HEAD -> release-0.0.2, develop) [Ismo Vuorinen]
- Changed date format on release header
## 0.0.1 (Elokuu 04, 2016)
- Uncomment rest of the script

View File

@@ -1 +1 @@
0.0.3
0.0.5

View File

@@ -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
@@ -137,3 +140,5 @@ git merge --no-ff $BRANCH_RELEASE
# Remove release branch
git branch -d $BRANCH_RELEASE
echo -e "${NOTICE_FLAG} Done!"