diff --git a/.travis.yml b/.travis.yml index e05d9f25c..68a919d30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,15 +43,15 @@ matrix: env: JOBS=4 MASON_PUBLISH=true before_install: - - ccache --version - - ccache -p - - ccache --show-stats - source scripts/travis-common.sh - export PYTHONUSERBASE=$(pwd)/mason_packages/.link - - export PATH=${PYTHONUSERBASE}/bin:${PATH} + - export PATH=$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH} - export COVERAGE=${COVERAGE:-false} - export MASON_PUBLISH=${MASON_PUBLISH:-false} - export BENCH=${BENCH:-false} + - ccache --version + - ccache -p || true + - ccache --show-stats || true - if [[ ${TRAVIS_BRANCH} != 'master' ]]; then export MASON_PUBLISH=false; fi - if [[ ${TRAVIS_PULL_REQUEST} != 'false' ]]; then export MASON_PUBLISH=false; fi - git_submodule_update --init --depth=10 diff --git a/bootstrap.sh b/bootstrap.sh index f565d01b4..040034f68 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -42,6 +42,7 @@ function install() { ICU_VERSION="55.1" function install_mason_deps() { + install ccache 3.2.4 & install jpeg_turbo 1.4.0 libjpeg & install libpng 1.6.20 libpng & install libtiff 4.0.4beta libtiff &