TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-22 16:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks to semver

Browse Source
This commit is contained in:
Neil Alexander 2018-12-18 12:14:47 +00:00
parent 3ea33c9fa7
commit 09ea9a166f
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/semver/version.sh
View File

@ -52,8 +52,8 @@ else
fi fi
# Get the number of merges on the current branch since the last tag # Get the number of merges on the current branch since the last tag
TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null) TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" --first-parent master 2>/dev/null)
BUILD=$(git rev-list $TAG..$BRANCH --count) BUILD=$(git rev-list $TAG.. --count)
# Add the build tag on non-master branches # Add the build tag on non-master branches
if [ $BRANCH != "master" ]; then if [ $BRANCH != "master" ]; then
@ -62,6 +62,6 @@ if [ $BRANCH != "master" ]; then
fi fi
else else
if [ $BUILD != 0 ]; then if [ $BUILD != 0 ]; then
printf -- "-%d" "$BUILD" printf -- "-%d" "$(($BUILD+1))"
fi fi
fi fi