diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh index a510826d..888075c8 100644 --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -21,7 +21,6 @@ fi if [ "${APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH}" != "" ]; then git fetch --all - echo "HEAD_REPO_BRANCH is ${APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH}" # git checkout ${APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH} elif [ "${APPVEYOR_REPO_BRANCH}" != "" ]; then diff --git a/contrib/semver/name.sh b/contrib/semver/name.sh index 308e07bc..53f56d5f 100644 --- a/contrib/semver/name.sh +++ b/contrib/semver/name.sh @@ -3,8 +3,11 @@ # Get the current branch name BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null) +if [ -n "$APPVEYOR_PULL_REQUEST_NUMBER" ]; then + printf "yggdrasil-pr%s" "$APPVEYOR_PULL_REQUEST_NUMBER" + exit 0 # Complain if the git history is not available -if [ $? != 0 ] || [ -z "$BRANCH" ]; then +elif [ $? != 0 ] || [ -z "$BRANCH" ]; then printf "yggdrasil" exit 0 fi