CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-05-30 00:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix checking out in build

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-10-23 18:30:06 +03:00
parent 1a4e9e394e
commit a7fff0ffc4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builder/image-build.sh
View File

@@ -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

5
builder/image-software.sh
View File

@@ -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/