diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh index 0ec0da3476c6..10a899369630 100755 --- a/.ci/travis/linux/script.sh +++ b/.ci/travis/linux/script.sh @@ -19,8 +19,7 @@ DIR=$(git rev-parse --show-toplevel)/.docker pushd $DIR -ccachedir=${HOME}/.ccache -mkdir -p $ccachedir +mkdir -p $CCACHE_DIR docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml index d2e677baa7d7..f5c194442e56 100644 --- a/.docker/docker-compose.travis.yml +++ b/.docker/docker-compose.travis.yml @@ -8,10 +8,11 @@ services: image: qgis/qgis3-build-deps:${DOCKER_TAG} volumes: - ${TRAVIS_BUILD_DIR}:/root/QGIS - - $HOME/.ccache:/root/.ccache + - $HOME/.ccache:/root/.ccache # if changed, also change env var links: - postgres environment: + - CCACHE_DIR=/root/.ccache - TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR} - TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} - TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH} diff --git a/.travis.yml b/.travis.yml index 08fe66a2cf73..d9fe0793f8a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: - 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_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" ) - + - CCACHE_DIR=${HOME}/.ccache dist: trusty sudo: false cache: