Skip to content

Commit a50af6e

Browse files
committed
Merge bitcoin/bitcoin#32044: ci: Revert "Temporary workaround for old CCACHE_DIR cirrus env"
fa21597 ci: Revert "Temporary workaround for old CCACHE_DIR cirrus env" (MarcoFalke) Pull request description: Seems fine to revert this now. If this still happens it should be rare enough and trivial to fix via a new push (normal push, force-push, rebase, ...), or to just ignore the failure. ACKs for top commit: fanquake: ACK fa21597 Tree-SHA512: 125946dcd4025b04f11276e1df1e0f1b361fc2deed2e3919d680d58df97e6d82881b21c0c683142df6995226b4c12b2dde5415ad78474b8fcda115cc69fa0207
2 parents a5a582d + fa21597 commit a50af6e

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

ci/test/02_run_container.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,11 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
9494
fi
9595

9696
if [ "$DANGER_CI_ON_HOST_CCACHE_FOLDER" ]; then
97-
# Temporary exclusion for https://github.com/bitcoin/bitcoin/issues/31108
98-
# to allow CI configs and envs generated in the past to work for a bit longer.
99-
# Can be removed in March 2025.
100-
if [ "${CCACHE_DIR}" != "/tmp/ccache_dir" ]; then
10197
if [ ! -d "${CCACHE_DIR}" ]; then
10298
echo "Error: Directory '${CCACHE_DIR}' must be created in advance."
10399
exit 1
104100
fi
105101
CI_CCACHE_MOUNT="type=bind,src=${CCACHE_DIR},dst=${CCACHE_DIR}"
106-
fi # End temporary exclusion
107102
fi
108103

109104
docker network create --ipv6 --subnet 1111:1111::/112 ci-ip6net || true

0 commit comments

Comments
 (0)