sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix docker variables in Travis"

Browse Source 
This reverts commit f4f3d0003a89a3c63035de98e3f953433de180fc.
This commit is contained in:
Denis Rouzaud 2018-03-20 18:22:19 +01:00
parent f4f3d0003a
commit fadf0b1057
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/travis/linux/before_script.sh
View File

@ -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

2
.ci/travis/linux/script.sh
View File

@ -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