From 5193045addebf41b19c8dcff869ea1d706ab959f Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 14:26:27 +0300 Subject: [PATCH 1/4] Fix changelog url --- CHANGELOG.md | 2 +- release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df25690..5a82358 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## 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) diff --git a/release.sh b/release.sh index be60534..827cda2 100755 --- a/release.sh +++ b/release.sh @@ -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,') From a1120207ee2b2690f4b4c1cd6fd040f2c9b59fd5 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 14:27:18 +0300 Subject: [PATCH 2/4] Better wording to push question --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 827cda2..1bd530b 100755 --- a/release.sh +++ b/release.sh @@ -148,7 +148,7 @@ 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 From 79a048ce20ac307c4d63d889797db9374e328210 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 14:27:44 +0300 Subject: [PATCH 3/4] Explicitly push tags --- release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release.sh b/release.sh index 1bd530b..cd8ddfd 100755 --- a/release.sh +++ b/release.sh @@ -153,6 +153,7 @@ 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!" From d9f2bc146b5c094f818c420bab5b7e5cc670c2bb Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 14:28:16 +0300 Subject: [PATCH 4/4] Incrementing version number to 0.1.2 --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a82358..c8f0afe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 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 diff --git a/VERSION b/VERSION index 17e51c3..d917d3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1 +0.1.2