try to use TRAVIS_EVENT_TYPE rather than TRAVIS_PULL_REQUEST

to see if it pushed the deps image
qgis · Feb 27, 2018 · 95bd72d · 95bd72d
1 parent 4a6e571
commit 95bd72d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -6,7 +6,7 @@ ARG DOCKER_TAG=latest
 ARG CACHE_DIR
 
 FROM  qgis/qgis3-build-deps:${DOCKER_TAG}
-MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
+MAINTAINER Denis Rouzaud <denis@opengis.ch>
 
 ENV CC=/usr/lib/ccache/clang
 ENV CXX=/usr/lib/ccache/clang++

diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -1,5 +1,5 @@
 FROM      ubuntu:18.04
-MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
+MAINTAINER Denis Rouzaud <denis@opengis.ch>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
 

diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,10 @@ matrix:
         - TRAVIS_CONFIG=linux
         - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
-        - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
+        - 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=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
+        - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "false" )
         - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty