diff options
author | merge-script <falke.marco@gmail.com> | 2021-09-16 10:55:55 +0200 |
---|---|---|
committer | merge-script <falke.marco@gmail.com> | 2021-09-16 10:55:55 +0200 |
commit | 87780dfee8c82ea09b84e74d331db2ad6f9e75ab (patch) | |
tree | 66bd66b2f06db9d7e3ca4b12454aa3d06751bba2 | |
parent | ec7ec69c7bcaea2b301991066a06b183b50ebe11 (diff) | |
parent | 252d1a70fb452893efe4ab64298139eb08d8ac98 (diff) |
Merge bitcoin/bitcoin#22994: ci: use Debian Bullseye in ARM CI
252d1a70fb452893efe4ab64298139eb08d8ac98 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 #20744.
See commentary starting here: https://github.com/bitcoin/bitcoin/pull/20744#issuecomment-810279549.
Also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93201.
ACKs for top commit:
MarcoFalke:
cr ACK 252d1a70fb452893efe4ab64298139eb08d8ac98
hebasto:
ACK 252d1a70fb452893efe4ab64298139eb08d8ac98, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: ca71f5cb07fe06c1c7f0160935e667ffeb62bd6a1a89b54124b5633c5c176347a2207aaa5eca68938ed89db9778d357e42b677115d4ed386fa2d7d2ffa5025ad
-rw-r--r-- | .cirrus.yml | 4 | ||||
-rwxr-xr-x | ci/test/00_setup_env_arm.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d15d24491c..b8e46aed64 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -149,10 +149,10 @@ task: - 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 task: - name: 'ARM [unit tests, no functional tests] [buster]' + name: 'ARM [unit tests, no functional tests] [bullseye]' << : *GLOBAL_TASK_TEMPLATE arm_container: - image: debian:buster + image: debian:bullseye cpu: 2 memory: 8G env: diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 8d2b70e549..93f8017d98 100755 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -18,7 +18,7 @@ if [ -n "$QEMU_USER_CMD" ]; then fi export CONTAINER_NAME=ci_arm_linux # Use debian to avoid 404 apt errors when cross compiling -export DOCKER_NAME_TAG="debian:buster" +export DOCKER_NAME_TAG="debian:bullseye" export USE_BUSY_BOX=true export RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=false |