From b57931ce8482aba52c6c6732cad9d50a9bd9eed0 Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Wed, 25 Mar 2020 16:20:31 -0400 Subject: [PATCH] Remove leading forward-slash from branch names before running "git checkout" in the git submodule regression check --- .cicd/submodule-regression-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/submodule-regression-check.sh b/.cicd/submodule-regression-check.sh index 9392ebb43..35519a8a5 100755 --- a/.cicd/submodule-regression-check.sh +++ b/.cicd/submodule-regression-check.sh @@ -5,8 +5,8 @@ declare -A BASE_MAP if [[ $BUILDKITE == true ]]; then [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]] && echo "Unable to find BUILDKITE_PULL_REQUEST_BASE_BRANCH ENV. Skipping submodule regression check." && exit 0 - BASE_BRANCH=$BUILDKITE_PULL_REQUEST_BASE_BRANCH - CURRENT_BRANCH=$BUILDKITE_BRANCH + BASE_BRANCH="$(echo "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" | sed 's.^/..')" + CURRENT_BRANCH="$(echo "$BUILDKITE_BRANCH" | sed 's.^/..')" else [[ -z $GITHUB_BASE_REF ]] && echo "Cannot find \$GITHUB_BASE_REF, so we have nothing to compare submodules to. Skipping submodule regression check." && exit 0 BASE_BRANCH=$GITHUB_BASE_REF