Fix checking out in build

CopterExpress · Oct 23, 2019 · a7fff0f · a7fff0f
1 parent 1a4e9e3
commit a7fff0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/builder/image-build.sh b/builder/image-build.sh
@@ -79,11 +79,9 @@ img-resize ${IMAGE_PATH} max '5G'
 # Checkout to tag's branch if built with travis tag
 if [[ ! -z ${TRAVIS_TAG} ]]; then
   cd ${REPO_DIR}
-  echo_stamp "Checkout to master from ${TRAVIS_TAG}" "INFO"
+  echo_stamp "Checkout to origin/pinocchio_work from ${TRAVIS_TAG}" "INFO"
   git fetch
   git checkout --track origin/pinocchio_work
-  git checkout master
-  git checkout pinocchio_work -- Drone/client_config.ini
   cd /
 fi
 

diff --git a/builder/image-software.sh b/builder/image-software.sh
@@ -73,6 +73,11 @@ catkin_make --pkg clever_flight_routines
 catkin_make aruco_pose
 source devel/setup.bash
 
+echo_stamp "Checkout clever-show to master, but fetch config from pinocchio_work"
+cd /home/pi/clever-show
+git checkout master
+git checkout pinocchio_work -- Drone/client_config.ini
+
 echo_stamp "Change clever-show and catkin_ws owner to pi"
 chown -Rf pi:pi /home/pi/clever-show/
 chown -Rf pi:pi /home/pi/catkin_ws/