Skip to content

Commit aa64b5f

Browse files
committed
try to use TRAVIS_EVENT_TYPE rather than TRAVIS_PULL_REQUEST
to see if it pushed the deps image
1 parent 348fe95 commit aa64b5f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.docker/qgis.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG DOCKER_TAG=latest
66
ARG CACHE_DIR
77

88
FROM qgis/qgis3-build-deps:${DOCKER_TAG}
9-
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
9+
MAINTAINER Denis Rouzaud <denis@opengis.ch>
1010

1111
ENV CC=/usr/lib/ccache/clang
1212
ENV CXX=/usr/lib/ccache/clang++

.docker/qgis3-build-deps.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ubuntu:18.04
2-
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
2+
MAINTAINER Denis Rouzaud <denis@opengis.ch>
33

44
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
55

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ matrix:
99
- TRAVIS_CONFIG=linux
1010
- DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
1111
- DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
12-
- DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
12+
- DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
1313
- DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
1414
# on cron job, QGIS image is built and push without testing
15-
- DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
15+
- DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "false" )
1616
- QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
1717
- CCACHE_DIR=${HOME}/.ccache
1818
dist: trusty

0 commit comments

Comments
 (0)