Skip to content

Commit a8d0f6c

Browse files
committed
Merge bitcoin/bitcoin#27886: ci: Switch to amd64 container in "ARM" task
016fe6d ci: Switch to `amd64` container in "ARM" task (Hennadii Stepanov) Pull request description: The `arm_container` does not support 32-bit mode anymore. Fixes bitcoin/bitcoin#27879. Also, the `arm_container` could be used for testing `aarch64` binaries, which are the part of our releases. Leaving that for another PR. ACKs for top commit: MarcoFalke: review ACK 016fe6d if CI is green Tree-SHA512: cdcc034938f4c101e211fceca0dcd7f50258f1085b74d6abe50bb0f45f1b92b99e2763436271583fdbad194cb9ed7e266d5597274555110ceaa7d762fe5a49d9
2 parents 6663c80 + 016fe6d commit a8d0f6c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.cirrus.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,17 +193,13 @@ task:
193193
task:
194194
name: 'ARM [unit tests, no functional tests] [bullseye]'
195195
<< : *GLOBAL_TASK_TEMPLATE
196-
arm_container:
197-
cpu: 2
198-
memory: 8G
199-
dockerfile: ci/test_imagefile
196+
container:
200197
docker_arguments:
201198
CI_IMAGE_NAME_TAG: debian:bullseye
202199
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
203200
<< : *CREDITS_TEMPLATE
204201
env:
205202
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
206-
QEMU_USER_CMD: "" # Disable qemu and run the test natively
207203

208204
task:
209205
name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]'

0 commit comments

Comments
 (0)