Skip to content

Commit

Permalink
explicit setup of ccache
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids authored and m-kuhn committed Sep 28, 2017
1 parent 634317e commit 451939d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .ci/travis/linux/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ DIR=$(git rev-parse --show-toplevel)/.docker

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

ccachedir=${HOME}/.ccache
mkdir -p $ccachedir
mkdir -p $CCACHE_DIR

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

Expand Down
3 changes: 2 additions & 1 deletion .docker/docker-compose.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 451939d

Please sign in to comment.