Skip to content
Permalink
Browse files

explicit setup of ccache

  • Loading branch information
3nids committed Aug 7, 2017
1 parent 10a92f6 commit ca5557b3add1fbbbf573717f2d356857d4a265d7
Showing with 4 additions and 4 deletions.
  1. +1 −2 .ci/travis/linux/script.sh
  2. +2 −1 .docker/docker-compose.travis.yml
  3. +1 −1 .travis.yml
@@ -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

@@ -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}
@@ -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:

0 comments on commit ca5557b

Please sign in to comment.
You can’t perform that action at this time.