From 22e650507960a5a062d6a4f85552241666b409d6 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sat, 8 Dec 2018 11:28:47 +0000 Subject: [PATCH 1/2] Fix bug from #228 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32a789c2..f3092ba1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: command: | mkdir /tmp/upload echo 'export CINAME=$(sh contrib/semver/name.sh)' >> $BASH_ENV - echo 'export CIVERSION=$(sh contrib/semver/version.sh | cut -c 2-)' >> $BASH_ENV + echo 'export CIVERSION=$(sh contrib/semver/version.sh --bare)' >> $BASH_ENV git config --global user.email "$(git log --format='%ae' HEAD -1)"; git config --global user.name "$(git log --format='%an' HEAD -1)"; From 3b2044666d65594bd57651a6724ede973e774971 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sat, 8 Dec 2018 11:31:20 +0000 Subject: [PATCH 2/2] Fix bug in semver version.sh --- contrib/semver/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/semver/version.sh b/contrib/semver/version.sh index 480c4dda..331046f3 100644 --- a/contrib/semver/version.sh +++ b/contrib/semver/version.sh @@ -15,7 +15,7 @@ PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" # Decide whether we should prepend the version with "v" - the default is that # we do because we use it in git tags, but we might not always need it PREPEND="v" -if [ "$1" == "--bare" ]; then +if [ "$1" = "--bare" ]; then PREPEND="" fi