File tree 3 files changed +4
-4
lines changed
3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,7 @@ DIR=$(git rev-parse --show-toplevel)/.docker
19
19
20
20
pushd $DIR
21
21
22
- ccachedir=${HOME} /.ccache
23
- mkdir -p $ccachedir
22
+ mkdir -p $CCACHE_DIR
24
23
25
24
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
26
25
Original file line number Diff line number Diff line change @@ -8,10 +8,11 @@ services:
8
8
image : qgis/qgis3-build-deps:${DOCKER_TAG}
9
9
volumes :
10
10
- ${TRAVIS_BUILD_DIR}:/root/QGIS
11
- - $HOME/.ccache:/root/.ccache
11
+ - $HOME/.ccache:/root/.ccache # if changed, also change env var
12
12
links :
13
13
- postgres
14
14
environment :
15
+ - CCACHE_DIR=/root/.ccache
15
16
- TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR}
16
17
- TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}
17
18
- TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ matrix:
10
10
- DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
11
11
- DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
12
12
- DOCKER_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
13
-
13
+ - CCACHE_DIR=${HOME}/.ccache
14
14
dist : trusty
15
15
sudo : false
16
16
cache :
You can’t perform that action at this time.
0 commit comments