Skip to content

Commit bc0e908

Browse files
MacroFakeDashCoreAutoGuix
authored andcommitted
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
1 parent 7325e06 commit bc0e908

File tree

2 files changed

+36
-11
lines changed

2 files changed

+36
-11
lines changed

.cirrus.yml

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,37 @@ base_template: &BASE_TEMPLATE
2727
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
2828
# Also, the merge commit is used to lint COMMIT_RANGE="HEAD~..HEAD"
2929

30+
main_template: &MAIN_TEMPLATE
31+
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
32+
ccache_cache:
33+
folder: "/tmp/ccache_dir"
34+
ci_script:
35+
- ./ci/test_run_all.sh
36+
3037
global_task_template: &GLOBAL_TASK_TEMPLATE
3138
<< : *BASE_TEMPLATE
32-
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
3339
container:
3440
# https://cirrus-ci.org/faq/#are-there-any-limits
3541
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
3642
cpu: 2
3743
greedy: true
3844
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
39-
ccache_cache:
40-
folder: "/tmp/ccache_dir"
4145
depends_built_cache:
42-
folder: "/tmp/cirrus-ci-build/depends/built"
46+
folder: "depends/built"
47+
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
4348
depends_sdk_cache:
4449
folder: "/tmp/cirrus-ci-build/depends/sdk-sources"
4550
depends_releases_cache:
4651
folder: "/tmp/cirrus-ci-build/releases"
47-
ci_script:
48-
- ./ci/test_run_all.sh
52+
<< : *MAIN_TEMPLATE
4953

54+
macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
55+
<< : *BASE_TEMPLATE
56+
check_clang_script:
57+
- clang --version
58+
brew_install_script:
59+
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
60+
<< : *MAIN_TEMPLATE
5061
compute_credits_template: &CREDITS_TEMPLATE
5162
# https://cirrus-ci.org/pricing/#compute-credits
5263
# Only use credits for pull requests to the main repo
@@ -169,15 +180,29 @@ task:
169180
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
170181

171182
task:
172-
name: 'macOS 12 native [gui, system sqlite only] [no depends]'
173-
brew_install_script:
174-
- brew install boost libevent qt@5 miniupnpc ccache zeromq qrencode libtool automake gnu-getopt
175-
<< : *GLOBAL_TASK_TEMPLATE
183+
name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]'
176184
macos_instance:
177185
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
178186
image: monterey-xcode-13.3 # https://cirrus-ci.org/guide/macOS
187+
<< : *MACOS_NATIVE_TASK_TEMPLATE
179188
env:
180189
DANGER_RUN_CI_ON_HOST: "true"
181190
CI_USE_APT_INSTALL: "no"
182191
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
183-
FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"
192+
FILE_ENV: "./ci/test/00_setup_env_mac_native_x86_64.sh"
193+
194+
task:
195+
name: 'ARM64 Android APK [focal]'
196+
<< : *BASE_TEMPLATE
197+
android_sdk_cache:
198+
folder: "depends/SDKs/android"
199+
fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
200+
depends_sources_cache:
201+
folder: "depends/sources"
202+
fingerprint_script: git rev-list -1 HEAD ./depends
203+
<< : *MAIN_TEMPLATE
204+
container:
205+
image: ubuntu:focal
206+
env:
207+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
208+
FILE_ENV: "./ci/test/00_setup_env_android.sh"
File renamed without changes.

0 commit comments

Comments
 (0)