cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-10 06:20:26 +00:00
Code Releases Activity

Merge pull request #229 from neilalexander/semver

Browse Source 
Fix circleci/semver bugs
This commit is contained in:
Neil Alexander 2018-12-08 11:37:51 +00:00 committed by GitHub
commit 9eace183c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -15,7 +15,7 @@ jobs:
command: | command: |
mkdir /tmp/upload mkdir /tmp/upload
echo 'export CINAME=$(sh contrib/semver/name.sh)' >> $BASH_ENV 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.email "$(git log --format='%ae' HEAD -1)";
git config --global user.name "$(git log --format='%an' HEAD -1)"; git config --global user.name "$(git log --format='%an' HEAD -1)";

2
contrib/semver/version.sh
View File

@ -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 # 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 # we do because we use it in git tags, but we might not always need it
PREPEND="v" PREPEND="v"
if [ "$1" == "--bare" ]; then if [ "$1" = "--bare" ]; then
PREPEND="" PREPEND=""
fi fi