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

Strip v from version during imprint

Browse Source
This commit is contained in:
Neil Alexander 2018-12-08 10:51:31 +00:00
parent 262c93504f
commit 9d0b8ac6f4
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@ -10,7 +10,7 @@ done
echo "Downloading..." echo "Downloading..."
for CMD in `ls cmd/` ; do for CMD in `ls cmd/` ; do
echo "Building: $CMD" echo "Building: $CMD"
IMPRINT="-X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildName=$(sh contrib/semver/name.sh) -X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildVersion=$(sh contrib/semver/version.sh)" IMPRINT="-X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildName=$(sh contrib/semver/name.sh) -X github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil.buildVersion=$(sh contrib/semver/version.sh --bare)"
if [ $DEBUG ]; then if [ $DEBUG ]; then
go build -ldflags="$IMPRINT" -tags debug -v ./cmd/$CMD go build -ldflags="$IMPRINT" -tags debug -v ./cmd/$CMD
else else

15
contrib/semver/version.sh
View File

@ -12,6 +12,13 @@ MERGE=$(git rev-list $TAG..master --grep "from $DEVELOPBRANCH" 2>/dev/null | hea
# Get the number of merges since the last merge to master # Get the number of merges since the last merge to master
PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" 2>/dev/null) PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" 2>/dev/null)
# 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
PREPEND=""
fi
# If it fails then there's no last tag - go from the first commit # If it fails then there's no last tag - go from the first commit
if [ $? != 0 ]; then if [ $? != 0 ]; then
PATCH=$(git rev-list HEAD --count 2>/dev/null) PATCH=$(git rev-list HEAD --count 2>/dev/null)
@ -22,7 +29,7 @@ if [ $? != 0 ]; then
exit 1 exit 1
fi fi
printf 'v0.0.%d' "$PATCH" printf '%s0.0.%d' "$PREPEND" "$PATCH"
exit 1 exit 1
fi fi
@ -39,12 +46,12 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
# Output in the desired format # Output in the desired format
if [ $PATCH = 0 ]; then if [ $PATCH = 0 ]; then
if [ ! -z $FULL ]; then if [ ! -z $FULL ]; then
printf 'v%d.%d.0' "$MAJOR" "$MINOR" printf '%s%d.%d.0' "$PREPEND" "$MAJOR" "$MINOR"
else else
printf 'v%d.%d' "$MAJOR" "$MINOR" printf '%s%d.%d' "$PREPEND" "$MAJOR" "$MINOR"
fi fi
else else
printf 'v%d.%d.%d' "$MAJOR" "$MINOR" "$PATCH" printf '%s%d.%d.%d' "$PREPEND" "$MAJOR" "$MINOR" "$PATCH"
fi fi
# Add the build tag on non-master branches # Add the build tag on non-master branches