Skip to content

Commit 2ef5004

Browse files
committed
Merge bitcoin#31146: ci: Temporary workaround for old CCACHE_DIR cirrus env
fa9747a ci: Temporary workaround for old CCACHE_DIR cirrus env (MarcoFalke) Pull request description: On a CI re-run, the historic env vars and CI config is used from Cirrus. However, the most recent CI config and CI scripts from this repo are used. This may lead to issues. For example, `CCACHE_DIR` in the old location may be missing on new CI workers and lead to errors. Fix it, by falling back to the old logic when the old `CCACHE_DIR` was detected. ACKs for top commit: fanquake: ACK fa9747a - have seen this now. Tree-SHA512: 04f0ca8d09ab0b8216a474fde1e05b79fbc6524884be173e8d728799739b026cda18d1797e0fe53d7e1b0ea69c0485acfe4f8a8f85408ea5bfdcffcf13a7ce55
2 parents 8c12fe8 + fa9747a commit 2ef5004

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ci/test/02_run_container.sh

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

6161
if [ "$DANGER_CI_ON_HOST_CCACHE_FOLDER" ]; then
62+
# Temporary exclusion for https://github.com/bitcoin/bitcoin/issues/31108
63+
# to allow CI configs and envs generated in the past to work for a bit longer.
64+
# Can be removed in March 2025.
65+
if [ "${CCACHE_DIR}" != "/tmp/ccache_dir" ]; then
6266
if [ ! -d "${CCACHE_DIR}" ]; then
6367
echo "Error: Directory '${CCACHE_DIR}' must be created in advance."
6468
exit 1
6569
fi
6670
CI_CCACHE_MOUNT="type=bind,src=${CCACHE_DIR},dst=${CCACHE_DIR}"
71+
fi # End temporary exclusion
6772
fi
6873

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

0 commit comments

Comments
 (0)