From e47824b1ff0c1d32f3ed43bf7ff5f8c1c8ebb2de Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Sat, 22 Sep 2018 00:01:58 +0300 Subject: [PATCH] image_builder: use BUILD_DIR in Travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8d61e04..f2cb05da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,13 @@ env: - IMAGE_VERSION="${TRAVIS_BRANCH}_$(echo ${TRAVIS_COMMIT} | cut -c1-7)" - IMAGE_PATH="$(pwd)/image/$(basename -s '.git' ${TARGET_REPO})_${IMAGE_VERSION}.img" - IMAGE_NAME="$(basename ${IMAGE_PATH})" + - BUILD_DIR="$(dirname ${IMAGE_PATH})" git: depth: 1 before_script: - docker pull ${DOCKER} script: - - docker run --privileged --rm -v /dev:/dev -v $(pwd)/image:/builder/image -e "TARGET_REPO=${TARGET_REPO}" -e "TARGET_REF=${TRAVIS_BRANCH}" ${DOCKER} + - docker run --privileged --rm -v /dev:/dev -v ${BUILD_DIR}:/builder/image -e "TARGET_REPO=${TARGET_REPO}" -e "TARGET_REF=${TRAVIS_BRANCH}" ${DOCKER} #after_failure: # - skip_deploy: true before_deploy: @@ -22,7 +23,7 @@ before_deploy: - git config --local user.name "urpylka" - git config --local user.email "urpylka@gmail.com" - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)" - - cd $(pwd)/image && zip ${IMAGE_NAME}.zip ${IMAGE_NAME} + - cd ${BUILD_DIR} && zip ${IMAGE_NAME}.zip ${IMAGE_NAME} deploy: provider: releases api_key: ${GITHUB_OAUTH_TOKEN}