From 16418839d8f13a2ab97885a632d6d52192cce61b Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 25 Mar 2020 15:16:50 -0400
Subject: [PATCH 1/3] Replace ALL forward-slashes with underscores in git
 branch names, not just the first one

---
 .cicd/installation-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index f787afb567b..ee6f52ad8f7 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 export ENABLE_INSTALL=true
-export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/')
+export BRANCH=$(echo $BUILDKITE_BRANCH | tr '/' '_')
 export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
 export ARGS="--name ci-contracts-builder-$BUILDKITE_PIPELINE_SLUG-$BUILDKITE_BUILD_NUMBER --init -v $(pwd):$MOUNTED_DIR"
 $CICD_DIR/build.sh

From ec94f8eb7732a24615d2d8806a5436dd966e7030 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 25 Mar 2020 15:21:20 -0400
Subject: [PATCH 2/3] Ignore leading forward-slash in git branch and tag names,
 as it has no meaning (https://stackoverflow.com/a/3651867)

---
 .cicd/docker-tag.sh         | 4 ++--
 .cicd/installation-build.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh
index 22da25dff95..961efaba971 100755
--- a/.cicd/docker-tag.sh
+++ b/.cicd/docker-tag.sh
@@ -4,8 +4,8 @@ echo '+++ :evergreen_tree: Configuring Environment'
 REPO='eosio/ci-contracts-builder'
 PREFIX='base-ubuntu-18.04'
 IMAGE="$REPO:$PREFIX-$BUILDKITE_COMMIT-$PLATFORM_TYPE"
-SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | tr '/' '_')
-SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | tr '/' '_')
+SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | sed 's.^/..' | tr '/' '_')
+SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | sed 's.^/..' | tr '/' '_')
 echo '+++ :arrow_down: Pulling Container'
 echo "Pulling \"$IMAGE\""
 docker pull "$IMAGE"
diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh
index ee6f52ad8f7..cee78967809 100755
--- a/.cicd/installation-build.sh
+++ b/.cicd/installation-build.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 . ./.cicd/helpers/general.sh
 export ENABLE_INSTALL=true
-export BRANCH=$(echo $BUILDKITE_BRANCH | tr '/' '_')
+export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's.^/..' | tr '/' '_')
 export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04"
 export ARGS="--name ci-contracts-builder-$BUILDKITE_PIPELINE_SLUG-$BUILDKITE_BUILD_NUMBER --init -v $(pwd):$MOUNTED_DIR"
 $CICD_DIR/build.sh

From 470811334bf286168f7633a25700b207d36dc995 Mon Sep 17 00:00:00 2001
From: Zach Butler <zach.butler@block.one>
Date: Wed, 25 Mar 2020 16:20:31 -0400
Subject: [PATCH 3/3] 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 9392ebb43b1..35519a8a5c4 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