From 786ff524428be0efa093f16027b9914418c87684 Mon Sep 17 00:00:00 2001
From: joshuawilson <javajoshw@gmail.com>
Date: Wed, 29 Aug 2018 08:45:03 -0400
Subject: [PATCH] fix(build): move the setting of the branch to the deploy
 script so PRs will run

---
 cico_build_deploy.sh |  2 ++
 cico_release.sh      | 10 ++++++++++
 cico_setup.sh        |  7 -------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cico_build_deploy.sh b/cico_build_deploy.sh
index a1b7c72..8ac789c 100755
--- a/cico_build_deploy.sh
+++ b/cico_build_deploy.sh
@@ -6,6 +6,8 @@ set -ex
 
 install_dependencies
 
+set_branch_to_master
+
 run_unit_tests
 
 build_project
diff --git a/cico_release.sh b/cico_release.sh
index 2914d61..8fe6e30 100755
--- a/cico_release.sh
+++ b/cico_release.sh
@@ -27,6 +27,16 @@ function release() {
     # create_merge_PR
 }
 
+function set_branch_to_master() {
+  # Set the branch as it defaults to the branch 'origin/master'
+  git checkout master
+  export GIT_BRANCH=master
+  # check where we are
+  git branch -va
+  git remote -v
+}
+
+
 # This function raises a PR against fabric8-npm-dependencies
 function create_merge_PR {
     # Fetch latest tags
diff --git a/cico_setup.sh b/cico_setup.sh
index d426b7d..1314d18 100755
--- a/cico_setup.sh
+++ b/cico_setup.sh
@@ -36,13 +36,6 @@ install_dependencies() {
   cp config/google-chrome.repo /etc/yum.repos.d/google-chrome.repo
   yum install -y google-chrome-stable
 
-  # Set the branch as it defaults to the branch 'origin/master'
-  git checkout master
-  export GIT_BRANCH=master
-  # check where we are
-  git branch -va
-  git remote -v
-
   if [ $? -eq 0 ]; then
       echo 'CICO: npm install : OK'
   else