yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #259 from neilalexander/semver"

Browse source 
This reverts commit 51b3746df6, reversing
changes made to 6e87791e50.
This commit is contained in:
Neil Alexander 2018-12-17 19:17:29 +00:00
parent c2468b4246
commit 0a9b34d121
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
contrib/semver/version.sh
View file

@ -3,7 +3,7 @@
# Merge commits from this branch are counted # Merge commits from this branch are counted
DEVELOPBRANCH="yggdrasil-network/develop" DEVELOPBRANCH="yggdrasil-network/develop"
# Get the last tag that denotes moving to a major version number # Get the last tag
TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null) TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null)
# Get last merge to master # Get last merge to master
@ -33,6 +33,9 @@ if [ $? != 0 ]; then
exit 1 exit 1
fi fi
# Get the number of merges on the current branch since the last tag
BUILD=$(git rev-list $TAG..HEAD --count --merges)
# Split out into major, minor and patch numbers # Split out into major, minor and patch numbers
MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1) MAJOR=$(echo $TAG | cut -c 2- | cut -d "." -f 1)
MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2) MINOR=$(echo $TAG | cut -c 2- | cut -d "." -f 2)
@ -53,10 +56,6 @@ fi
# Add the build tag on non-master branches # Add the build tag on non-master branches
if [ $BRANCH != "master" ]; then if [ $BRANCH != "master" ]; then
# Get the number of merges on the current branch since the last tag
BUILDTAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.[0-9]*" 2>/dev/null)
BUILD=$(git rev-list $BUILDTAG..HEAD --count --merges)
if [ $BUILD != 0 ]; then if [ $BUILD != 0 ]; then
printf -- "-%04d" "$BUILD" printf -- "-%04d" "$BUILD"
fi fi