From b6dd0c524836a77bac0d4ace224ca2f57ec0e7c5 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Mon, 5 Mar 2018 22:59:48 -0600 Subject: [PATCH] try to fix the pull/N issue with circleci again --- contrib/semver/name.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/semver/name.sh b/contrib/semver/name.sh index 467f30c4..d749d3ff 100644 --- a/contrib/semver/name.sh +++ b/contrib/semver/name.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Get the branch name -BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null) +# Get the branch name, removing any "/" characters from pull requests +BRANCH=$(git symbolic-ref --short HEAD | tr -d "/" 2>/dev/null) # Check if the branch name is not master if [ "$BRANCH" = "master" ]; then @@ -10,5 +10,4 @@ if [ "$BRANCH" = "master" ]; then fi # If it is something other than master, append it -# Remove any "/" characters from e.g. "pull/N" -printf "yggdrasil-%s" "${BRANCH/\//}" +printf "yggdrasil-%s" "$BRANCH"