Skip to content

Commit 939640f

Browse files
committed
ci: Reorder scripts to make git available before depends_sources_cache
1 parent 3facf0a commit 939640f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.cirrus.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ base_template: &BASE_TEMPLATE
2929
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts
3030
stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks
3131

32-
global_task_template: &GLOBAL_TASK_TEMPLATE
33-
<< : *BASE_TEMPLATE
32+
task_template: &TASK_TEMPLATE
3433
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
3534
container:
3635
# https://cirrus-ci.org/faq/#are-there-any-limits
@@ -44,6 +43,10 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
4443
ci_script:
4544
- ./ci/test_run_all.sh
4645

46+
global_task_template: &GLOBAL_TASK_TEMPLATE
47+
<< : *BASE_TEMPLATE
48+
<< : *TASK_TEMPLATE
49+
4750
depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE
4851
depends_sdk_cache:
4952
folder: "depends/sdk-sources"
@@ -211,9 +214,10 @@ task:
211214
task:
212215
name: 'ARM64 Android APK [focal]'
213216
<< : *DEPENDS_SDK_CACHE_TEMPLATE
217+
<< : *BASE_TEMPLATE
214218
depends_sources_cache:
215219
folder: "depends/sources"
216-
<< : *GLOBAL_TASK_TEMPLATE
220+
<< : *TASK_TEMPLATE
217221
container:
218222
image: ubuntu:focal
219223
env:

0 commit comments

Comments
 (0)