Skip to content

Commit 4bca26e

Browse files
committed
Merge bitcoin/bitcoin#27690: ci: Use credits for ARM task
fa3761d ci: Reduce tsan CPU and memory for faster scheduling (MarcoFalke) aaaa07b ci: Use credits for ARM task (MarcoFalke) Pull request description: After bitcoin/bitcoin#27562 the task should finish in less than 10 minutes, so also using credits for it will be cheap and improve dev experience. ACKs for top commit: fanquake: ACK fa3761d Tree-SHA512: 98ba76eaa63bcbab674076bb9877b3a20d1b90e6d51e2fd7b97ae245414e984d734006b15ea60228a1f4f9bc72fbe2a1a8910fd05e7c52dd2a8b223bfaa25b50
2 parents 77b0a80 + fa3761d commit 4bca26e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.cirrus.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ task:
200200
docker_arguments:
201201
CI_IMAGE_NAME_TAG: debian:bullseye
202202
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
203+
<< : *CREDITS_TEMPLATE
203204
env:
204205
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
205206
QEMU_USER_CMD: "" # Disable qemu and run the test natively
@@ -242,8 +243,8 @@ task:
242243
name: '[TSan, depends, gui] [lunar]'
243244
<< : *GLOBAL_TASK_TEMPLATE
244245
container:
245-
cpu: 6 # Increase CPU and Memory to avoid timeout
246-
memory: 24G
246+
cpu: 4
247+
memory: 16G # The default memory is too small, so double everything
247248
docker_arguments:
248249
CI_IMAGE_NAME_TAG: ubuntu:lunar
249250
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
@@ -297,7 +298,7 @@ task:
297298
<< : *GLOBAL_TASK_TEMPLATE
298299
container:
299300
cpu: 4
300-
memory: 16G # The default memory is sometimes just a bit too small, so double everything
301+
memory: 16G # The default memory is too small, so double everything
301302
docker_arguments:
302303
CI_IMAGE_NAME_TAG: ubuntu:focal
303304
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"

0 commit comments

Comments
 (0)