Merge bc4f6b13fe into merged_master (Bitcoin PR bitcoin/bitcoin#28024)

This commit is contained in:
Byron Hambly 2025-06-30 15:47:25 +02:00
commit 0d42dbb108

View file

@ -46,7 +46,6 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
# https://cirrus-ci.org/faq/#are-there-any-limits
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
cpu: 2
greedy: true
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
dockerfile: ci/test_imagefile # https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment
depends_built_cache:
@ -85,13 +84,11 @@ task:
name: 'tidy [24.04]'
<< : *GLOBAL_TASK_TEMPLATE
container:
cpu: 2
cpu: 4
memory: 5G
docker_arguments:
CI_IMAGE_NAME_TAG: ubuntu:24.04
FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
# For faster CI feedback, immediately schedule the linters
<< : *CREDITS_TEMPLATE
env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
@ -247,7 +244,6 @@ task:
docker_arguments:
CI_IMAGE_NAME_TAG: ubuntu:24.04
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
<< : *CREDITS_TEMPLATE
env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
MAKEJOBS: "-j2" # Avoid excessive memory use due to MSan
@ -325,7 +321,6 @@ task:
docker_arguments:
CI_IMAGE_NAME_TAG: ubuntu:jammy
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
<< : *CREDITS_TEMPLATE
macos_sdk_cache:
folder: "depends/SDKs/$MACOS_SDK"
fingerprint_key: "$MACOS_SDK"