Update semver behaviour

This commit is contained in:
Neil Alexander 2018-12-07 22:17:09 +00:00
parent 8bd566d4d8
commit 4bc009d845
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
2 changed files with 13 additions and 3 deletions

View File

@ -1,10 +1,19 @@
#!/bin/sh #!/bin/sh
# Get the branch name, removing any "/" characters from pull requests # Get the current branch name
BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null | tr -d "/") BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
# Complain if the git history is not available
if [ $? != 0 ]; then
printf "unknown"
exit -1
fi
# Remove "/" characters from the branch name if present
BRANCH=$(echo $BRANCH | tr -d "/")
# Check if the branch name is not master # Check if the branch name is not master
if [ "$BRANCH" = "master" ] || [ $? != 0 ]; then if [ "$BRANCH" = "master" ]; then
printf "yggdrasil" printf "yggdrasil"
exit 0 exit 0
fi fi

View File

@ -16,6 +16,7 @@ PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH"
if [ $? != 0 ]; then if [ $? != 0 ]; then
PATCH=$(git rev-list HEAD --count 2>/dev/null) PATCH=$(git rev-list HEAD --count 2>/dev/null)
# Complain if the git history is not available
if [ $? != 0 ]; then if [ $? != 0 ]; then
printf 'unknown' printf 'unknown'
exit -1 exit -1