Skip to content

Commit 87780df

Browse files
author
merge-script
committed
Merge bitcoin#22994: ci: use Debian Bullseye in ARM CI
252d1a7 ci: use Debian Bullseye in ARM CI (fanquake) Pull request description: This works around an issue when trying to use `std::filesystem::remove_all` with the ARM GCC on Buster. Has been split out of bitcoin#20744. See commentary starting here: bitcoin#20744 (comment). Also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93201. ACKs for top commit: MarcoFalke: cr ACK 252d1a7 hebasto: ACK 252d1a7, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: ca71f5cb07fe06c1c7f0160935e667ffeb62bd6a1a89b54124b5633c5c176347a2207aaa5eca68938ed89db9778d357e42b677115d4ed386fa2d7d2ffa5025ad
2 parents ec7ec69 + 252d1a7 commit 87780df

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ task:
149149
- python test\functional\test_runner.py --ci --quiet --combinedlogslen=4000 --jobs=4 --timeout-factor=8 rpc_help feature_config_args rpc_signer feature_presegwit_node_upgrade "tool_wallet.py --descriptors" --failfast # TODO enable '--extended' and remove cherry-picked test list
150150

151151
task:
152-
name: 'ARM [unit tests, no functional tests] [buster]'
152+
name: 'ARM [unit tests, no functional tests] [bullseye]'
153153
<< : *GLOBAL_TASK_TEMPLATE
154154
arm_container:
155-
image: debian:buster
155+
image: debian:bullseye
156156
cpu: 2
157157
memory: 8G
158158
env:

ci/test/00_setup_env_arm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ -n "$QEMU_USER_CMD" ]; then
1818
fi
1919
export CONTAINER_NAME=ci_arm_linux
2020
# Use debian to avoid 404 apt errors when cross compiling
21-
export DOCKER_NAME_TAG="debian:buster"
21+
export DOCKER_NAME_TAG="debian:bullseye"
2222
export USE_BUSY_BOX=true
2323
export RUN_UNIT_TESTS=true
2424
export RUN_FUNCTIONAL_TESTS=false

0 commit comments

Comments
 (0)