From a28f2259f130564f758c5c8f248251d30ab88bfe Mon Sep 17 00:00:00 2001
From: jame mackson <jamemackson@icloud.com>
Date: Wed, 11 Nov 2020 18:32:19 -0600
Subject: [PATCH 1/4] allow using buildback in CI tests

---
 bin/compile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index 7a98a4e..59c148e 100755
--- a/bin/compile
+++ b/bin/compile
@@ -6,6 +6,9 @@ ENV_DIR="$3"
 # load required environment variables
 GIT_REPO_URL=$(<"$ENV_DIR/GIT_REPO_URL")
 GIT_SSH_KEY=$(<"$ENV_DIR/GIT_SSH_KEY")
+SOURCE_VERSION=$(<"$ENV_DIR/SOURCE_VERSION")
+CI=$(<"$ENV_DIR/CI")
+HEROKU_TEST_RUN_BRANCH=$(<"$ENV_DIR/HEROKU_TEST_RUN_BRANCH")
 
 if [[ -z $GIT_REPO_URL ]]; then
     echo "Did you forget to set GIT_REPO_URL?"
@@ -50,7 +53,12 @@ echo "-----> Installed SSH key from GIT_SSH_KEY"
 
 # checkout the revision that's being deployed
 git fetch -q --depth 1 origin -a > /dev/null
-git checkout -q ${SOURCE_VERSION:-master} > /dev/null
+if [ $CI ]
+then
+    git checkout -q ${HEROKU_TEST_RUN_BRANCH:-master} > /dev/null
+else 
+    git checkout -q ${SOURCE_VERSION:-master} > /dev/null
+fi
 echo "-----> Fetched shallow history from $GIT_REPO_URL"
 
 # initialize all the submodules

From 8185a3f2cb65af0aefa0ac1b0497b1daa48c5188 Mon Sep 17 00:00:00 2001
From: jame mackson <jamemackson@icloud.com>
Date: Tue, 8 Dec 2020 16:07:36 -0600
Subject: [PATCH 2/4] debug ENV_DIR contents

---
 bin/compile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/compile b/bin/compile
index 59c148e..2bf44a2 100755
--- a/bin/compile
+++ b/bin/compile
@@ -9,6 +9,8 @@ GIT_SSH_KEY=$(<"$ENV_DIR/GIT_SSH_KEY")
 SOURCE_VERSION=$(<"$ENV_DIR/SOURCE_VERSION")
 CI=$(<"$ENV_DIR/CI")
 HEROKU_TEST_RUN_BRANCH=$(<"$ENV_DIR/HEROKU_TEST_RUN_BRANCH")
+echo "listing ENV_DIR"
+ls -lah $ENV_DIR
 
 if [[ -z $GIT_REPO_URL ]]; then
     echo "Did you forget to set GIT_REPO_URL?"

From f62f13ad251c86eda7a3ce8cb8859279a26b92e1 Mon Sep 17 00:00:00 2001
From: jame mackson <jamemackson@icloud.com>
Date: Tue, 8 Dec 2020 16:10:23 -0600
Subject: [PATCH 3/4] look for HEROKU_BRANCH

---
 bin/compile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index 2bf44a2..18acfa4 100755
--- a/bin/compile
+++ b/bin/compile
@@ -9,6 +9,7 @@ GIT_SSH_KEY=$(<"$ENV_DIR/GIT_SSH_KEY")
 SOURCE_VERSION=$(<"$ENV_DIR/SOURCE_VERSION")
 CI=$(<"$ENV_DIR/CI")
 HEROKU_TEST_RUN_BRANCH=$(<"$ENV_DIR/HEROKU_TEST_RUN_BRANCH")
+HEROKU_BRANCH=$(<"$ENV_DIR/HEROKU_BRANCH")
 echo "listing ENV_DIR"
 ls -lah $ENV_DIR
 
@@ -58,8 +59,13 @@ git fetch -q --depth 1 origin -a > /dev/null
 if [ $CI ]
 then
     git checkout -q ${HEROKU_TEST_RUN_BRANCH:-master} > /dev/null
-else 
-    git checkout -q ${SOURCE_VERSION:-master} > /dev/null
+else
+    if [ $HEROKU_BRANCH ]
+    then
+        git checkout -q ${HEROKU_BRANCH:-master} > /dev/null
+    else
+        git checkout -q ${SOURCE_VERSION:-master} > /dev/null
+    fi
 fi
 echo "-----> Fetched shallow history from $GIT_REPO_URL"
 

From 2e00ad84dab0f9e5356eb2cb792d7ee3c8f43a6f Mon Sep 17 00:00:00 2001
From: jame mackson <jamemackson@icloud.com>
Date: Tue, 8 Dec 2020 16:30:11 -0600
Subject: [PATCH 4/4] remove debugging

---
 bin/compile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index 18acfa4..890ae22 100755
--- a/bin/compile
+++ b/bin/compile
@@ -10,8 +10,6 @@ SOURCE_VERSION=$(<"$ENV_DIR/SOURCE_VERSION")
 CI=$(<"$ENV_DIR/CI")
 HEROKU_TEST_RUN_BRANCH=$(<"$ENV_DIR/HEROKU_TEST_RUN_BRANCH")
 HEROKU_BRANCH=$(<"$ENV_DIR/HEROKU_BRANCH")
-echo "listing ENV_DIR"
-ls -lah $ENV_DIR
 
 if [[ -z $GIT_REPO_URL ]]; then
     echo "Did you forget to set GIT_REPO_URL?"