From fafa064d2a8dbe24303545ab582ec84cde52ab5b Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 10 Oct 2019 19:03:51 -0400 Subject: [PATCH] ci: Remove ccache requirement on the host ccache is only needed to create the cache dir on the host, if it didn't already exist. The same can be achieved with mkdir, so just use that instead. --- .cirrus.yml | 2 -- ci/README.md | 2 +- ci/test/04_install.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9464ec16850..517cd935855 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -45,8 +45,6 @@ task: folder: "/tmp/ccache_dir" depends_built_cache: folder: "/tmp/cirrus-ci-build/depends/built" - depends_sdk_cache: - folder: "/tmp/cirrus-ci-build/depends/sdk-sources" install_script: - apt-get update - apt-get -y install git bash ccache diff --git a/ci/README.md b/ci/README.md index 16c481158f3..fb1cd7460b6 100644 --- a/ci/README.md +++ b/ci/README.md @@ -12,7 +12,7 @@ To allow for a wide range of tested environments, but also ensure reproducibilit requires `docker` to be installed. To install all requirements on Ubuntu, run ``` -sudo apt install docker.io ccache bash git +sudo apt install docker.io bash git ``` To run the default test stage, diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index d0831a4c13c..df07b8fe5cd 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -33,7 +33,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then fi mkdir -p "${BASE_SCRATCH_DIR}" -ccache echo "Creating ccache dir if it didn't already exist" +mkdir -p "${CCACHE_DIR}" if [ ! -d ${DIR_QA_ASSETS} ]; then git clone https://github.com/bitcoin-core/qa-assets ${DIR_QA_ASSETS}