Skip to content

Commit b9122e9

Browse files
author
MacroFake
committed
Merge bitcoin#25444: ci: macOS task imrovements
0bb7a1f ci: Improve naming related to "macOS 12 native x86_64" task (Hennadii Stepanov) 8e017f3 ci, refactor: Add `MACOS_NATIVE_TASK_TEMPLATE` (Hennadii Stepanov) Pull request description: Split from bitcoin#25160 as [suggested](bitcoin#25160 (comment)). ACKs for top commit: MarcoFalke: ACK 0bb7a1f 🚘 Tree-SHA512: d50fe8a51a3364e76d1a5394f718e30bd2994ccdaa4bf73c017c5d81bff00539dcff1cd3879c8b4b6b442b7248b0aa6491489a27c6dd7ec1f3e976aa2a03c730
2 parents ddd7a39 + 0bb7a1f commit b9122e9

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

.cirrus.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,30 @@ base_template: &BASE_TEMPLATE
3535

3636
main_template: &MAIN_TEMPLATE
3737
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
38+
ccache_cache:
39+
folder: "/tmp/ccache_dir"
40+
ci_script:
41+
- ./ci/test_run_all.sh
42+
43+
global_task_template: &GLOBAL_TASK_TEMPLATE
44+
<< : *BASE_TEMPLATE
3845
container:
3946
# https://cirrus-ci.org/faq/#are-there-any-limits
4047
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
4148
cpu: 2
4249
greedy: true
4350
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
44-
ccache_cache:
45-
folder: "/tmp/ccache_dir"
4651
depends_built_cache:
4752
folder: "depends/built"
4853
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
49-
ci_script:
50-
- ./ci/test_run_all.sh
54+
<< : *MAIN_TEMPLATE
5155

52-
global_task_template: &GLOBAL_TASK_TEMPLATE
56+
macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
5357
<< : *BASE_TEMPLATE
58+
check_clang_script:
59+
- clang --version
60+
brew_install_script:
61+
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
5462
<< : *MAIN_TEMPLATE
5563

5664
compute_credits_template: &CREDITS_TEMPLATE
@@ -306,18 +314,16 @@ task:
306314
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
307315

308316
task:
309-
name: 'macOS 12 native [gui, system sqlite only] [no depends]'
310-
brew_install_script:
311-
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
312-
<< : *GLOBAL_TASK_TEMPLATE
317+
name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]'
313318
macos_instance:
314319
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
315320
image: monterey-xcode-13.3 # https://cirrus-ci.org/guide/macOS
321+
<< : *MACOS_NATIVE_TASK_TEMPLATE
316322
env:
317323
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
318324
CI_USE_APT_INSTALL: "no"
319325
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
320-
FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"
326+
FILE_ENV: "./ci/test/00_setup_env_mac_native_x86_64.sh"
321327

322328
task:
323329
name: 'ARM64 Android APK [focal]'

0 commit comments

Comments
 (0)