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.1.2'

Browse Source
This commit is contained in:
Ismo Vuorinen
2016-08-10 14:28:16 +03:00
parent ea7562a48d d9f2bc146b
commit a62b76f1bd
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
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) ## 0.1.1 (2016-08-10)
- Echo into the temp file, not to the screen - 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) ## 0.1.0 (2016-08-10)

2
VERSION
View File

@@ -1 +1 @@
0.1.1 0.1.2

5
release.sh
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), # 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 # 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 # current Git branch
BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,') BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
@@ -148,11 +148,12 @@ git merge --no-ff "$BRANCH_RELEASE"
# Remove release branch # Remove release branch
git branch -d "$BRANCH_RELEASE" git branch -d "$BRANCH_RELEASE"
echo -ne "${QUESTION_FLAG} ${CYAN}Push?" echo -ne "${QUESTION_FLAG} ${CYAN}Push everything to origin?"
read -r PUSH read -r PUSH
if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
git push --all origin git push --all origin
git push --tags origin
fi fi
echo -e "${NOTICE_FLAG} Done!" echo -e "${NOTICE_FLAG} Done!"