From a0b8fa91c8a8d8bea94ab6b82318379cc8718364 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 13:38:22 +0300 Subject: [PATCH 1/5] Add composer.json, ignore vendor folder --- .gitignore | 1 + composer.json | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 .gitignore create mode 100644 composer.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57872d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vendor/ diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..f8bb5e7 --- /dev/null +++ b/composer.json @@ -0,0 +1,16 @@ +{ + "name": "superhelio/tools", + "description": "Collection of our tools", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Ismo Vuorinen", + "email": "ismo.vuorinen@superhelio.com" + } + ], + "require": {}, + "bin": [ + "release.sh" + ] +} \ No newline at end of file From 06677cea398ca470c27e11a64d4980844a3500a6 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 13:38:57 +0300 Subject: [PATCH 2/5] Add link to full changelog, detect project url from origin url --- release.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release.sh b/release.sh index a1aa749..caf14dc 100755 --- a/release.sh +++ b/release.sh @@ -25,6 +25,10 @@ RESET="\033[0m" 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*//') + # current Git branch BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,') @@ -114,6 +118,8 @@ echo "$NEW_VERSION" > "$FILE_VERSION" echo "## $NEW_VERSION ($NOW)" > tmpfile git log --pretty=format:" - %h %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile echo "" >> tmpfile +echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)" +echo "" >> tmpfile echo "" >> tmpfile cat "$FILE_CHANGELOG" >> tmpfile mv tmpfile $FILE_CHANGELOG From ec78cb833578a8a05dfa49f7224022c3054b097f Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 13:40:32 +0300 Subject: [PATCH 3/5] Change changelog formatting to simple message --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index caf14dc..4a8972b 100755 --- a/release.sh +++ b/release.sh @@ -116,7 +116,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:" - %s" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile echo "" >> tmpfile echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)" echo "" >> tmpfile From c2ccbbf08fbb02b11ba563445362811d291853c9 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 13:41:05 +0300 Subject: [PATCH 4/5] Remove paging from git log, works better for automation --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 4a8972b..74f415d 100755 --- a/release.sh +++ b/release.sh @@ -116,7 +116,7 @@ echo "$NEW_VERSION" > "$FILE_VERSION" # Create our changelog echo "## $NEW_VERSION ($NOW)" > tmpfile -git log --pretty=format:" - %s" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile +git --no-pager log --pretty=format:" - %s" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile echo "" >> tmpfile echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)" echo "" >> tmpfile From bfec35ece40bcbec9d42b0dab20ed2889bf102f1 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Wed, 10 Aug 2016 13:43:45 +0300 Subject: [PATCH 5/5] Incrementing version number to 0.1.0 --- CHANGELOG.md | 7 +++++++ VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03653a3..d6dccf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 0.1.0 (2016-08-10) + - Remove paging from git log, works better for automation + - Change changelog formatting to simple message + - Add link to full changelog, detect project url from origin url + - Add composer.json, ignore vendor folder + + ## 0.0.10 (2016-08-04) - db2367d 2016-08-04 | Create the README.md (HEAD -> release-0.0.10, develop) [Ismo Vuorinen] - 0140b53 2016-08-04 | Implement [shellcheck](https://www.shellcheck.net/) recommendations [Ismo Vuorinen] diff --git a/VERSION b/VERSION index 7c1886b..6e8bf73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.10 +0.1.0