From 1a4e9e394efaa2d073dccf480c04228b89beebfe Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Wed, 23 Oct 2019 18:16:02 +0300 Subject: [PATCH] builder: Checkout to master and fetch client_config from pinocchio_work --- builder/image-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builder/image-build.sh b/builder/image-build.sh index c879a7f..beea361 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -79,9 +79,11 @@ 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 origin/pinocchio_work from ${TRAVIS_TAG}" "INFO" + echo_stamp "Checkout to master 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