superhelio/tools
1
0
Fork 0
mirror of https://github.com/superhelio/tools.git synced 2026-01-26 11:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-0.0.4'

Browse Source
This commit is contained in:
Ismo Vuorinen
2016-08-04 16:45:20 +03:00
parent f58d1c50dd 73859c9cf3
commit f8af60b6b1
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -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]

2
VERSION
View File

@@ -1 +1 @@
0.0.3
0.0.4

5
release.sh
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