From fa21597064b8599b04461b8d3553e802e47d063e Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Wed, 12 Mar 2025 17:44:02 +0100 Subject: [PATCH] ci: Revert "Temporary workaround for old CCACHE_DIR cirrus env" This reverts commit fa9747a896188f4dd70f275aec2469dba5cd435e. --- ci/test/02_run_container.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 8351fd4e02a..9616018e31e 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -94,16 +94,11 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then fi if [ "$DANGER_CI_ON_HOST_CCACHE_FOLDER" ]; then - # Temporary exclusion for https://github.com/bitcoin/bitcoin/issues/31108 - # to allow CI configs and envs generated in the past to work for a bit longer. - # Can be removed in March 2025. - if [ "${CCACHE_DIR}" != "/tmp/ccache_dir" ]; then if [ ! -d "${CCACHE_DIR}" ]; then echo "Error: Directory '${CCACHE_DIR}' must be created in advance." exit 1 fi CI_CCACHE_MOUNT="type=bind,src=${CCACHE_DIR},dst=${CCACHE_DIR}" - fi # End temporary exclusion fi docker network create --ipv6 --subnet 1111:1111::/112 ci-ip6net || true