diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-07-03 15:51:29 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-07-04 10:41:25 +0200 |
| commit | fac14c4e498f2d38b8b337d4c145129d07403a6d (patch) | |
| tree | 102e3da58e72087c9726a0151dd97788a500cc55 /.cirrus.yml | |
| parent | f08d914a678f7ceb81e7584efe92d3840f3b9c95 (diff) | |
| download | bitcoin-fac14c4e498f2d38b8b337d4c145129d07403a6d.tar.xz | |
ci: Remove deprecated container.greedy
The option is to be phased out, so remove it to avoid relying on it.
Update container.cpu and timeouts where needed.
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 40db8321b2..5010bc9433 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -45,7 +45,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: @@ -84,13 +83,11 @@ task: name: 'tidy [lunar]' << : *GLOBAL_TASK_TEMPLATE container: - cpu: 2 + cpu: 4 memory: 5G docker_arguments: CI_IMAGE_NAME_TAG: ubuntu:lunar 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 @@ -244,7 +241,6 @@ task: docker_arguments: CI_IMAGE_NAME_TAG: ubuntu:lunar FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" - << : *CREDITS_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV @@ -320,7 +316,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" |