Use new semver versioning for CircleCI builds

This commit is contained in:
Neil Alexander 2018-03-05 20:20:17 +00:00
parent a75ddff9f3
commit 6366558258
3 changed files with 37 additions and 20 deletions

View file

@ -11,10 +11,9 @@ then
fi
PKGBRANCH=$(basename `git name-rev --name-only HEAD`)
if [ "$PKGBRANCH" = "master" ]; then PKGNAME=yggdrasil
else PKGNAME=yggdrasil-${PKGBRANCH}; fi
PKGNAME=$(sh contrib/semver/name.sh)
PKGVERSION=$(sh contrib/semver/version.sh | cut -c 2-)
PKGARCH=${PKGARCH-amd64}
PKGVERSION=$(cat VERSION).$(git rev-list HEAD --count 2>/dev/null | xargs printf "%04d")
PKGFILE=$PKGNAME-$PKGVERSION-$PKGARCH.deb
if [ $PKGARCH = "amd64" ]; then GOARCH=amd64 GOOS=linux ./build

19
contrib/semver/name.sh Normal file
View file

@ -0,0 +1,19 @@
#!/bin/sh
# Get the branch name
BRANCH=$(git name-rev --name-only HEAD 2>/dev/null)
# Check if the branch name check fails
if [ $? != 0 ]; then
printf "yggdrasil"
exit 0
fi
# Check if the branch name is not master
if [ "$BRANCH" = "master" ]; then
printf "yggdrasil"
exit 0
fi
# If it is something other than master, append it
printf "yggdrasil-%s" "$BRANCH"