diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-02-09 12:11:26 +0000 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-02-09 12:11:26 +0000 |
| commit | 8a61527cf6c29e8d63eb5d3e01c63cfca8862cfb (patch) | |
| tree | 737b5b722412286945d05e7d23cbd3f35946f134 /.cirrus.yml | |
| parent | dc905f6c2a60961aee73578fd3092bf90b28409f (diff) | |
ci: Re-introduce `depends_built` cache back in macOS and Android tasks
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1ff2a46a3f..8785e42155 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,6 +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) + +global_task_template: &GLOBAL_TASK_TEMPLATE + << : *CONTAINER_DEPENDS_TEMPLATE << : *MAIN_TEMPLATE macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE @@ -308,13 +311,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 @@ -334,7 +337,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 +347,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" |