diff options
| author | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2023-02-09 19:05:49 +0100 |
|---|---|---|
| committer | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2023-02-09 19:05:49 +0100 |
| commit | af2bd07587b62b719b596b35e6fd54c60f747bd4 (patch) | |
| tree | c952b748bb09606e51c21a094671343cb39414c7 | |
| parent | dc905f6c2a60961aee73578fd3092bf90b28409f (diff) | |
| parent | 73a3b161b7bb29327d0a529235cdc7d0295bd316 (diff) | |
Merge bitcoin/bitcoin#27062: ci: Re-introduce `depends_built` cache back in macOS and Android tasks
73a3b161b7bb29327d0a529235cdc7d0295bd316 ci: Inline `MACOS_NATIVE_TASK_TEMPLATE` (Hennadii Stepanov)
8a61527cf6c29e8d63eb5d3e01c63cfca8862cfb ci: Re-introduce `depends_built` cache back in macOS and Android tasks (Hennadii Stepanov)
Pull request description:
This PR brings a `depends_built` cache back to the "macOS 10.15" and "ARM64 Android APK" CI tasks.
Fixes #27031.
ACKs for top commit:
MarcoFalke:
reACK 73a3b161b7bb29327d0a529235cdc7d0295bd316 🌻
Tree-SHA512: 2eb845f865ee2ee453c1fd284d5eeddbebb2653586b17946822fec03d46e73c5eb483499761a0de6c3c466b06623957664e22dee01f7312ad18e212f1c9c6439
| -rw-r--r-- | .cirrus.yml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1ff2a46a3f..232b24117a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -39,7 +39,7 @@ main_template: &MAIN_TEMPLATE ci_script: - ./ci/test_run_all.sh -global_task_template: &GLOBAL_TASK_TEMPLATE +container_depends_template: &CONTAINER_DEPENDS_TEMPLATE << : *BASE_TEMPLATE container: # https://cirrus-ci.org/faq/#are-there-any-limits @@ -50,14 +50,9 @@ global_task_template: &GLOBAL_TASK_TEMPLATE depends_built_cache: folder: "depends/built" fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends) - << : *MAIN_TEMPLATE -macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE - << : *BASE_TEMPLATE - check_clang_script: - - clang --version - brew_install_script: - - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt +global_task_template: &GLOBAL_TASK_TEMPLATE + << : *CONTAINER_DEPENDS_TEMPLATE << : *MAIN_TEMPLATE compute_credits_template: &CREDITS_TEMPLATE @@ -308,13 +303,13 @@ task: task: name: 'macOS 10.15 [gui, no tests] [focal]' - << : *BASE_TEMPLATE + << : *CONTAINER_DEPENDS_TEMPLATE + container: + image: ubuntu:focal macos_sdk_cache: folder: "depends/SDKs/$MACOS_SDK" fingerprint_key: "$MACOS_SDK" << : *MAIN_TEMPLATE - container: - image: ubuntu:focal env: MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers" << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV @@ -325,7 +320,12 @@ task: macos_instance: # Use latest image, but hardcode version to avoid silent upgrades (and breaks) image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS - << : *MACOS_NATIVE_TASK_TEMPLATE + << : *BASE_TEMPLATE + check_clang_script: + - clang --version + brew_install_script: + - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt + << : *MAIN_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV CI_USE_APT_INSTALL: "no" @@ -334,7 +334,9 @@ task: task: name: 'ARM64 Android APK [jammy]' - << : *BASE_TEMPLATE + << : *CONTAINER_DEPENDS_TEMPLATE + container: + image: ubuntu:jammy android_sdk_cache: folder: "depends/SDKs/android" fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313" @@ -342,8 +344,6 @@ task: folder: "depends/sources" fingerprint_script: git rev-list -1 HEAD ./depends << : *MAIN_TEMPLATE - container: - image: ubuntu:jammy env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_android.sh" |