Fix bugs in CircleCI naming

This commit is contained in:
Neil Alexander 2018-03-05 20:26:55 +00:00
parent 6366558258
commit d58c971559
2 changed files with 1 additions and 7 deletions

View File

@ -16,7 +16,7 @@ jobs:
command: | command: |
mkdir /tmp/upload mkdir /tmp/upload
echo 'export CINAME=$(sh contrib/semver/name.sh)' >> $BASH_ENV 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: - run:
name: Build for Linux (including Debian packages) name: Build for Linux (including Debian packages)

View File

@ -3,12 +3,6 @@
# Get the branch name # Get the branch name
BRANCH=$(git name-rev --name-only HEAD 2>/dev/null) 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 # Check if the branch name is not master
if [ "$BRANCH" = "master" ]; then if [ "$BRANCH" = "master" ]; then
printf "yggdrasil" printf "yggdrasil"