From bbb2c90910bf78a6c85d7814eab39ad556848997 Mon Sep 17 00:00:00 2001 From: Arthur Golubtsov Date: Mon, 21 Oct 2019 08:48:11 +0100 Subject: [PATCH] Modify image build --- builder/image-build.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/builder/image-build.sh b/builder/image-build.sh index c7263c80..8d7e6e0b 100755 --- a/builder/image-build.sh +++ b/builder/image-build.sh @@ -79,11 +79,8 @@ img-resize ${IMAGE_PATH} max '5G' # Checkout to tag's branch if built with travis tag if [[ ! -z ${TRAVIS_TAG} ]]; then cd ${REPO_DIR} - REMOTE_BRANCH="$(git branch -r --contains ${TRAVIS_TAG} | sed -n 1p | cut -d ' ' -f 5)" - BRANCH="$(echo ${REMOTE_BRANCH} | cut -d '/' -f 2)" - echo_stamp "Checkout to ${REMOTE_BRANCH} from ${TRAVIS_TAG}" "INFO" - git branch ${BRANCH} ${REMOTE_BRANCH} - git checkout ${BRANCH} + echo_stamp "Checkout to origin/pinnochio from ${TRAVIS_TAG}" "INFO" + git checkout --track origin/pinnochio cd / fi