phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 03:03:22 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Remove deprecated container.greedy

Browse source 
The option is to be phased out, so remove it to avoid relying on it.
Update container.cpu and timeouts where needed.
This commit is contained in:
MarcoFalke 2023-07-03 15:51:29 +02:00
parent f08d914a67
commit fac14c4e49
No known key found for this signature in database
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.cirrus.yml
View file

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