Skip to content

Commit 8c867ed

Browse files
author
MarcoFalke
committed
Merge #21675: ci: Only cache depends/sdk-sources for macos/apk task in cirrus
11115c8 ci: Only cache depends/sdk-sources for macos/apk task in cirrus (MarcoFalke) Pull request description: Only macos needs the sdk-sources, so move it there (and remove it from showing up in the other tasks) ACKs for top commit: hebasto: ACK 11115c8 Tree-SHA512: 9e80e74016052e7b00314e191acc84c5e400bbf2e0d93ee7b1494b6be99e671cc326ddaa1fbded82f0912a9e338ad1891019dce78199b08c5180af42cb59729a
2 parents a12962c + 11115c8 commit 8c867ed

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.cirrus.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
4141
folder: "/tmp/ccache_dir"
4242
depends_built_cache:
4343
folder: "depends/built"
44-
depends_sdk_cache:
45-
folder: "depends/sdk-sources"
4644
ci_script:
4745
- ./ci/test_run_all.sh
4846

47+
depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE
48+
depends_sdk_cache:
49+
folder: "depends/sdk-sources"
50+
4951
compute_credits_template: &CREDITS_TEMPLATE
5052
# https://cirrus-ci.org/pricing/#compute-credits
5153
# Only use credits for pull requests to the main repo
@@ -178,6 +180,7 @@ task:
178180

179181
task:
180182
name: 'macOS 10.14 [gui, no tests] [focal]'
183+
<< : *DEPENDS_SDK_CACHE_TEMPLATE
181184
<< : *GLOBAL_TASK_TEMPLATE
182185
container:
183186
image: ubuntu:focal
@@ -202,6 +205,7 @@ task:
202205

203206
task:
204207
name: 'ARM64 Android APK [focal]'
208+
<< : *DEPENDS_SDK_CACHE_TEMPLATE
205209
depends_sources_cache:
206210
folder: "depends/sources"
207211
<< : *GLOBAL_TASK_TEMPLATE

0 commit comments

Comments
 (0)