From 557d3f1cc065702ebbf929d39ac7c5561111ce4c Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Mon, 13 Jul 2020 23:51:29 +0300 Subject: [PATCH] ci: Do not activate Travis ccache caching strategy It is sufficient to specify CCACHE_DIR to cache. Also this change fixes ccache on native macOS build. --- .travis.yml | 1 - ci/test/00_setup_env_mac_host.sh | 1 + ci/test/04_install.sh | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 210f3a1ae..bffcc560c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ os: linux language: minimal arch: amd64 cache: - ccache: true directories: - $TRAVIS_BUILD_DIR/depends/built - $TRAVIS_BUILD_DIR/depends/sdk-sources diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index 6a2b3e7e3..cabb7a403 100644 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -13,6 +13,7 @@ export GOAL="install" export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" export NO_DEPENDS=1 export OSX_SDK="" +export CCACHE_SIZE=300M export RUN_SECURITY_TESTS="true" if [ "$TRAVIS_REPO_SLUG" != "bitcoin/bitcoin" ]; then diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 7cbf6f9d1..d3566914a 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -14,7 +14,6 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then - export PATH="/usr/local/opt/ccache/libexec:$PATH" ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES fi