diff --git a/.circleci/config.yml b/.circleci/config.yml index be772aed..0ec36733 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: command: | mkdir /tmp/upload echo 'export CINAME=$(sh contrib/semver/name.sh)' >> $BASH_ENV - echo 'export CIVERSION=$(sh contrib/semver/version.sh)' >> $BASH_ENV + echo 'export CIVERSION=$(sh contrib/semver/version.sh | cut -c 2-)' >> $BASH_ENV - run: name: Build for Linux (including Debian packages) diff --git a/contrib/semver/name.sh b/contrib/semver/name.sh index ee2f8cd8..82527596 100644 --- a/contrib/semver/name.sh +++ b/contrib/semver/name.sh @@ -3,12 +3,6 @@ # 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"