Skip to content

Commit

Permalink
ci: Do not activate Travis ccache caching strategy
Browse files Browse the repository at this point in the history
It is sufficient to specify CCACHE_DIR to cache.
Also this change fixes ccache on native macOS build.
  • Loading branch information
hebasto committed Jul 13, 2020
1 parent 2d74742 commit 557d3f1
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci/test/00_setup_env_mac_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ci/test/04_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 557d3f1

Please sign in to comment.