Skip to content
Permalink
Browse files

Revert "fix docker variables in Travis"

This reverts commit f4f3d00.
  • Loading branch information
3nids committed Mar 20, 2018
1 parent f4f3d00 commit fadf0b10575cbb948693ca9323b402b9f4a955ac
Showing with 2 additions and 2 deletions.
  1. +1 −1 .ci/travis/linux/before_script.sh
  2. +1 −1 .ci/travis/linux/script.sh
@@ -23,7 +23,7 @@ source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.
DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
# on cron job, QGIS image is built and push without testing
DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
DOCKER_QGIS_IMAGE_BUILD_PUSH=create_qgis_image
QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds


@@ -17,7 +17,7 @@ set -e

source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh

DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)
DOCKER_QGIS_IMAGE_BUILD_PUSH=create_qgis_image

mkdir -p $CCACHE_DIR

0 comments on commit fadf0b1

Please sign in to comment.
You can’t perform that action at this time.