Skip to content

Commit 9dc1e8b

Browse files
3nidsm-kuhn
authored andcommitted
explicit setup of ccache
1 parent 6cda41d commit 9dc1e8b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.ci/travis/linux/script.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ DIR=$(git rev-parse --show-toplevel)/.docker
2020

2121
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
2222

23-
ccachedir=${HOME}/.ccache
24-
mkdir -p $ccachedir
23+
mkdir -p $CCACHE_DIR
2524

2625
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
2726

.docker/docker-compose.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ services:
88
image: qgis/qgis3-build-deps:${DOCKER_TAG}
99
volumes:
1010
- ${TRAVIS_BUILD_DIR}:/root/QGIS
11-
- $HOME/.ccache:/root/.ccache
11+
- $HOME/.ccache:/root/.ccache # if changed, also change env var
1212
links:
1313
- postgres
1414
environment:
15+
- CCACHE_DIR=/root/.ccache
1516
- TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR}
1617
- TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}
1718
- TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ matrix:
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" )
1212
- DOCKER_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
13-
13+
- CCACHE_DIR=${HOME}/.ccache
1414
dist: trusty
1515
sudo: false
1616
cache:

0 commit comments

Comments
 (0)