diff options
| author | fanquake <fanquake@gmail.com> | 2023-06-14 14:35:37 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-06-14 14:36:03 +0100 |
| commit | a8d0f6c863a088db918b17b32cd3771ce5ed5970 (patch) | |
| tree | 0ed944fa70f646ff43d5a9b93081975d4e111157 /.cirrus.yml | |
| parent | 6663c802fee07692283d55a785896d8712d11d9c (diff) | |
| parent | 016fe6d8280768917081894dfca233c2f06e78d9 (diff) | |
| download | bitcoin-a8d0f6c863a088db918b17b32cd3771ce5ed5970.tar.xz | |
Merge bitcoin/bitcoin#27886: ci: Switch to `amd64` container in "ARM" task
016fe6d8280768917081894dfca233c2f06e78d9 ci: Switch to `amd64` container in "ARM" task (Hennadii Stepanov)
Pull request description:
The `arm_container` does not support 32-bit mode anymore.
Fixes https://github.com/bitcoin/bitcoin/issues/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 016fe6d8280768917081894dfca233c2f06e78d9 if CI is green
Tree-SHA512: cdcc034938f4c101e211fceca0dcd7f50258f1085b74d6abe50bb0f45f1b92b99e2763436271583fdbad194cb9ed7e266d5597274555110ceaa7d762fe5a49d9
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3090deef78..a32870f939 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -193,17 +193,13 @@ task: task: name: 'ARM [unit tests, no functional tests] [bullseye]' << : *GLOBAL_TASK_TEMPLATE - arm_container: - cpu: 2 - memory: 8G - dockerfile: ci/test_imagefile + container: docker_arguments: CI_IMAGE_NAME_TAG: debian:bullseye FILE_ENV: "./ci/test/00_setup_env_arm.sh" << : *CREDITS_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - QEMU_USER_CMD: "" # Disable qemu and run the test natively task: name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]' |