Merge branch 'release-0.1.2'

This commit is contained in:
Ismo Vuorinen
2016-08-10 14:28:16 +03:00
3 changed files with 13 additions and 4 deletions

View File

@@ -1,7 +1,15 @@
## 0.1.2 (2016-08-10)
- Explicitly push tags
- Better wording to push question
- Fix changelog url
[Full changelog](https://github.com/superhelio/tools/compare/0.1.1...0.1.2)
## 0.1.1 (2016-08-10)
- Echo into the temp file, not to the screen
[Full changelog](https://github.com/superhelio/tools.git/compare/0.1.0...0.1.1)
[Full changelog](https://github.com/superhelio/tools/compare/0.1.0...0.1.1)
## 0.1.0 (2016-08-10)

View File

@@ -1 +1 @@
0.1.1
0.1.2

View File

@@ -27,7 +27,7 @@ LATEST_HASH=$(git log --pretty=format:'%h' -n 1)
# Guess our remote url from remote.origin.url (minus .git from the end),
# change to your github project url. used to create Full changelog link
PROJECT_URL=$(git config --get remote.origin.url | sed 's/^\.git*//')
PROJECT_URL=$(git config --get remote.origin.url | sed 's/\.git//')
# current Git branch
BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
@@ -148,11 +148,12 @@ git merge --no-ff "$BRANCH_RELEASE"
# Remove release branch
git branch -d "$BRANCH_RELEASE"
echo -ne "${QUESTION_FLAG} ${CYAN}Push?"
echo -ne "${QUESTION_FLAG} ${CYAN}Push everything to origin?"
read -r PUSH
if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
git push --all origin
git push --tags origin
fi
echo -e "${NOTICE_FLAG} Done!"