Skip to content

Commit

Permalink
Merge #27886: ci: Switch to amd64 container in "ARM" task
Browse files Browse the repository at this point in the history
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 #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
  • Loading branch information
fanquake committed Jun 14, 2023
2 parents 6663c80 + 016fe6d commit a8d0f6c
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]'
Expand Down

0 comments on commit a8d0f6c

Please sign in to comment.