From 2a8806921218340664654ae54c052ce4ee507851 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 17:11:56 +0300 Subject: [PATCH 1/4] Fixed pushing --- release.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/release.sh b/release.sh index 84db7e1..a4a9715 100755 --- a/release.sh +++ b/release.sh @@ -145,9 +145,7 @@ echo -ne "${QUESTION_FLAG} ${CYAN}Push?" read PUSH if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then - git push --tags - git push $BRANCH_MASTER - git push $BRANCH_DEV + git push --all origin fi echo -e "${NOTICE_FLAG} Done!" From 94cefa42a85861735fb030f3b379417e912e0af0 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 17:14:38 +0300 Subject: [PATCH 2/4] Remove merges from git log command output --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index a4a9715..6f1b72e 100755 --- a/release.sh +++ b/release.sh @@ -111,7 +111,7 @@ echo $NEW_VERSION > $FILE_VERSION # Create our changelog echo "## $NEW_VERSION ($NOW)" > tmpfile -git log --pretty=format:" - %H %ad | %s%d [%an]" --date=short "$BASE_STRING"...HEAD >> tmpfile +git log --pretty=format:" - %H %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile echo "" >> tmpfile echo "" >> tmpfile cat $FILE_CHANGELOG >> tmpfile From 72d3fe5a12712bcfc2d2cb80c3c4521f8d577391 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 17:16:11 +0300 Subject: [PATCH 3/4] Changed git log hash length --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 6f1b72e..1c54652 100755 --- a/release.sh +++ b/release.sh @@ -111,7 +111,7 @@ echo $NEW_VERSION > $FILE_VERSION # Create our changelog echo "## $NEW_VERSION ($NOW)" > tmpfile -git log --pretty=format:" - %H %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile +git log --pretty=format:" - %h %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile echo "" >> tmpfile echo "" >> tmpfile cat $FILE_CHANGELOG >> tmpfile From cb5c3234f9e9f2c90f7d190bc2c3c146c744e15a Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 4 Aug 2016 17:17:14 +0300 Subject: [PATCH 4/4] Incrementing version number to 0.0.9 --- CHANGELOG.md | 19 ++++++++++++------- VERSION | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bcdecc..11ff478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,26 @@ +## 0.0.9 (2016-08-04) + - 72d3fe5 2016-08-04 | Changed git log hash length (HEAD -> release-0.0.9, develop) [Ismo Vuorinen] + - 94cefa4 2016-08-04 | Remove merges from git log command output [Ismo Vuorinen] + - 2a88069 2016-08-04 | Fixed pushing [Ismo Vuorinen] + ## 0.0.8 (2016-08-04) - - 964866a2e355442d238994e0a31ac8a45d429c2c 2016-08-04 | Push master and dev branches explicitly (HEAD -> release-0.0.8, develop) [Ismo Vuorinen] + - 964866a 2016-08-04 | Push master and dev branches explicitly (HEAD -> release-0.0.8, develop) [Ismo Vuorinen] ## 0.0.7 (2016-08-04) - - 9408ec3c5d22b54d038c0909926ee661fbd7c25c 2016-08-04 | Change pushing to do all (HEAD -> release-0.0.7, develop) [Ismo Vuorinen] + - 9408ec3 2016-08-04 | Change pushing to do all (HEAD -> release-0.0.7, develop) [Ismo Vuorinen] ## 0.0.6 (2016-08-04) - - 5af80c229c83d1716876f767fed56fa0352dbaab 2016-08-04 | Ask should we push to origin, with tags (HEAD -> release-0.0.6, develop) [Ismo Vuorinen] + - 5af80c2 2016-08-04 | Ask should we push to origin, with tags (HEAD -> release-0.0.6, develop) [Ismo Vuorinen] ## 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] + - 9ac3cdf 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] + - 865447c 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] + - c23b512 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen] + - e4f313a 2016-08-04 | Add missing changelog file [Ismo Vuorinen] ## 0.0.2 (2016-08-04) - Changed date format on release header diff --git a/VERSION b/VERSION index d169b2f..c5d54ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.8 +0.0.9