Skip to content

Commit 1ce7dba

Browse files
lbartolettilbartoletti
committedJan 29, 2018
Merge branch 'master' of https://github.com/qgis/QGIS into usr_bin_env
·
ltr-3_40final-3_0_0
2 parents 59c2ab4 + d512611 commit 1ce7dba

File tree

4,568 files changed

+212642
-255995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,568 files changed

+212642
-255995
lines changed
 

‎.ci/travis/linux/before_script.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ docker-compose --version
2323
docker-compose -f $DOCKER_COMPOSE config
2424
#docker pull ubuntu:16.04
2525
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
26-
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
26+
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
27+
docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
28+
else
29+
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
30+
fi
2731
echo "travis_fold:end:docker"
2832
# image should be pushed even if QGIS build fails
2933
# but push is achieved only on branches (not for PRs)

‎.ci/travis/linux/blacklist.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ PyQgsSpatialiteProvider
3030
# Flaky, see https://travis-ci.org/qgis/QGIS/jobs/297708174
3131
PyQgsServerAccessControl
3232

33+
# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=61670866&build=297397
34+
PyQgsLocator
35+
3336
# Need a local postgres installation
3437
PyQgsAuthManagerPKIPostgresTest
3538
PyQgsAuthManagerPasswordPostgresTest
3639
PyQgsAuthManagerOgrPostgresTest
40+

0 commit comments

Comments
 (0)