fix(build): move the setting of the branch to the deploy script so PR…

…s will run
fabric8-ui · Aug 29, 2018 · 786ff52 · 786ff52
1 parent 6da1c0d
commit 786ff52
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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