Skip to content

Commit bc4f6b1

Browse files
committed
Merge bitcoin#28024: ci: Remove deprecated container.greedy
fac14c4 ci: Remove deprecated container.greedy (MarcoFalke) Pull request description: The option is to be phased out, so remove it to avoid relying on it. Update container.cpu where needed. ACKs for top commit: hebasto: ACK fac14c4. Tree-SHA512: 0440b710e607aaa2f78f811f9d5ae786a59af4a44861d7905a25c742ff7f5b4558518b939539455309503266757182a1c8fce92c8d3430983b2103a613fe01d7
2 parents c71a96c + fac14c4 commit bc4f6b1

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

.cirrus.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
4545
# https://cirrus-ci.org/faq/#are-there-any-limits
4646
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
4747
cpu: 2
48-
greedy: true
4948
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
5049
dockerfile: ci/test_imagefile # https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment
5150
depends_built_cache:
@@ -84,13 +83,11 @@ task:
8483
name: 'tidy [lunar]'
8584
<< : *GLOBAL_TASK_TEMPLATE
8685
container:
87-
cpu: 2
86+
cpu: 4
8887
memory: 5G
8988
docker_arguments:
9089
CI_IMAGE_NAME_TAG: ubuntu:lunar
9190
FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
92-
# For faster CI feedback, immediately schedule the linters
93-
<< : *CREDITS_TEMPLATE
9491
env:
9592
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
9693

@@ -244,7 +241,6 @@ task:
244241
docker_arguments:
245242
CI_IMAGE_NAME_TAG: ubuntu:lunar
246243
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
247-
<< : *CREDITS_TEMPLATE
248244
env:
249245
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
250246

@@ -320,7 +316,6 @@ task:
320316
docker_arguments:
321317
CI_IMAGE_NAME_TAG: ubuntu:jammy
322318
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
323-
<< : *CREDITS_TEMPLATE
324319
macos_sdk_cache:
325320
folder: "depends/SDKs/$MACOS_SDK"
326321
fingerprint_key: "$MACOS_SDK"

0 commit comments

Comments
 (0)