Skip to content

Commit

Permalink
fix docker variables in Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Mar 20, 2018
1 parent 88191dc commit f4f3d00
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/linux/before_script.sh
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion .ci/travis/linux/script.sh
Expand Up @@ -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

Expand Down

0 comments on commit f4f3d00

Please sign in to comment.