mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-06-04 08:22:36 +02:00
Merge bitcoin/bitcoin#27062: ci: Re-introduce depends_built
cache back in macOS and Android tasks
73a3b161b7
ci: Inline `MACOS_NATIVE_TASK_TEMPLATE` (Hennadii Stepanov)8a61527cf6
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: reACK73a3b161b7
🌻 Tree-SHA512: 2eb845f865ee2ee453c1fd284d5eeddbebb2653586b17946822fec03d46e73c5eb483499761a0de6c3c466b06623957664e22dee01f7312ad18e212f1c9c6439
This commit is contained in:
commit
af2bd07587
30
.cirrus.yml
30
.cirrus.yml
@ -39,7 +39,7 @@ main_template: &MAIN_TEMPLATE
|
|||||||
ci_script:
|
ci_script:
|
||||||
- ./ci/test_run_all.sh
|
- ./ci/test_run_all.sh
|
||||||
|
|
||||||
global_task_template: &GLOBAL_TASK_TEMPLATE
|
container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
|
||||||
<< : *BASE_TEMPLATE
|
<< : *BASE_TEMPLATE
|
||||||
container:
|
container:
|
||||||
# https://cirrus-ci.org/faq/#are-there-any-limits
|
# https://cirrus-ci.org/faq/#are-there-any-limits
|
||||||
@ -50,14 +50,9 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
|
|||||||
depends_built_cache:
|
depends_built_cache:
|
||||||
folder: "depends/built"
|
folder: "depends/built"
|
||||||
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
|
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
|
||||||
<< : *MAIN_TEMPLATE
|
|
||||||
|
|
||||||
macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
|
global_task_template: &GLOBAL_TASK_TEMPLATE
|
||||||
<< : *BASE_TEMPLATE
|
<< : *CONTAINER_DEPENDS_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
|
<< : *MAIN_TEMPLATE
|
||||||
|
|
||||||
compute_credits_template: &CREDITS_TEMPLATE
|
compute_credits_template: &CREDITS_TEMPLATE
|
||||||
@ -308,13 +303,13 @@ task:
|
|||||||
|
|
||||||
task:
|
task:
|
||||||
name: 'macOS 10.15 [gui, no tests] [focal]'
|
name: 'macOS 10.15 [gui, no tests] [focal]'
|
||||||
<< : *BASE_TEMPLATE
|
<< : *CONTAINER_DEPENDS_TEMPLATE
|
||||||
|
container:
|
||||||
|
image: ubuntu:focal
|
||||||
macos_sdk_cache:
|
macos_sdk_cache:
|
||||||
folder: "depends/SDKs/$MACOS_SDK"
|
folder: "depends/SDKs/$MACOS_SDK"
|
||||||
fingerprint_key: "$MACOS_SDK"
|
fingerprint_key: "$MACOS_SDK"
|
||||||
<< : *MAIN_TEMPLATE
|
<< : *MAIN_TEMPLATE
|
||||||
container:
|
|
||||||
image: ubuntu:focal
|
|
||||||
env:
|
env:
|
||||||
MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
|
MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
|
||||||
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
||||||
@ -325,7 +320,12 @@ task:
|
|||||||
macos_instance:
|
macos_instance:
|
||||||
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
|
# 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
|
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:
|
env:
|
||||||
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
||||||
CI_USE_APT_INSTALL: "no"
|
CI_USE_APT_INSTALL: "no"
|
||||||
@ -334,7 +334,9 @@ task:
|
|||||||
|
|
||||||
task:
|
task:
|
||||||
name: 'ARM64 Android APK [jammy]'
|
name: 'ARM64 Android APK [jammy]'
|
||||||
<< : *BASE_TEMPLATE
|
<< : *CONTAINER_DEPENDS_TEMPLATE
|
||||||
|
container:
|
||||||
|
image: ubuntu:jammy
|
||||||
android_sdk_cache:
|
android_sdk_cache:
|
||||||
folder: "depends/SDKs/android"
|
folder: "depends/SDKs/android"
|
||||||
fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
|
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"
|
folder: "depends/sources"
|
||||||
fingerprint_script: git rev-list -1 HEAD ./depends
|
fingerprint_script: git rev-list -1 HEAD ./depends
|
||||||
<< : *MAIN_TEMPLATE
|
<< : *MAIN_TEMPLATE
|
||||||
container:
|
|
||||||
image: ubuntu:jammy
|
|
||||||
env:
|
env:
|
||||||
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
||||||
FILE_ENV: "./ci/test/00_setup_env_android.sh"
|
FILE_ENV: "./ci/test/00_setup_env_android.sh"
|
||||||
|
Loading…
Reference in New Issue
Block a user