Skip to content

Commit 8a61527

Browse files
committed
ci: Re-introduce depends_built cache back in macOS and Android tasks
1 parent dc905f6 commit 8a61527

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.cirrus.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ main_template: &MAIN_TEMPLATE
3939
ci_script:
4040
- ./ci/test_run_all.sh
4141

42-
global_task_template: &GLOBAL_TASK_TEMPLATE
42+
container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
4343
<< : *BASE_TEMPLATE
4444
container:
4545
# https://cirrus-ci.org/faq/#are-there-any-limits
@@ -50,6 +50,9 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
5050
depends_built_cache:
5151
folder: "depends/built"
5252
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
53+
54+
global_task_template: &GLOBAL_TASK_TEMPLATE
55+
<< : *CONTAINER_DEPENDS_TEMPLATE
5356
<< : *MAIN_TEMPLATE
5457

5558
macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
@@ -308,13 +311,13 @@ task:
308311

309312
task:
310313
name: 'macOS 10.15 [gui, no tests] [focal]'
311-
<< : *BASE_TEMPLATE
314+
<< : *CONTAINER_DEPENDS_TEMPLATE
315+
container:
316+
image: ubuntu:focal
312317
macos_sdk_cache:
313318
folder: "depends/SDKs/$MACOS_SDK"
314319
fingerprint_key: "$MACOS_SDK"
315320
<< : *MAIN_TEMPLATE
316-
container:
317-
image: ubuntu:focal
318321
env:
319322
MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
320323
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
@@ -334,16 +337,16 @@ task:
334337

335338
task:
336339
name: 'ARM64 Android APK [jammy]'
337-
<< : *BASE_TEMPLATE
340+
<< : *CONTAINER_DEPENDS_TEMPLATE
341+
container:
342+
image: ubuntu:jammy
338343
android_sdk_cache:
339344
folder: "depends/SDKs/android"
340345
fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
341346
depends_sources_cache:
342347
folder: "depends/sources"
343348
fingerprint_script: git rev-list -1 HEAD ./depends
344349
<< : *MAIN_TEMPLATE
345-
container:
346-
image: ubuntu:jammy
347350
env:
348351
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
349352
FILE_ENV: "./ci/test/00_setup_env_android.sh"

0 commit comments

Comments
 (0)