From 939640f87ec385d08f1b04bfd7f61c80038c4565 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 16 Aug 2021 11:44:54 +0300
Subject: [PATCH 1/2] ci: Reorder scripts to make git available before
 depends_sources_cache

---
 .cirrus.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 26bd27754..178a9fc98 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -29,8 +29,7 @@ base_template: &BASE_TEMPLATE
     - git merge FETCH_HEAD  # Merge base to detect silent merge conflicts
   stateful: false  # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks
 
-global_task_template: &GLOBAL_TASK_TEMPLATE
-  << : *BASE_TEMPLATE
+task_template: &TASK_TEMPLATE
   timeout_in: 120m  # https://cirrus-ci.org/faq/#instance-timed-out
   container:
     # https://cirrus-ci.org/faq/#are-there-any-limits
@@ -44,6 +43,10 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
   ci_script:
     - ./ci/test_run_all.sh
 
+global_task_template: &GLOBAL_TASK_TEMPLATE
+  << : *BASE_TEMPLATE
+  << : *TASK_TEMPLATE
+
 depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE
   depends_sdk_cache:
     folder: "depends/sdk-sources"
@@ -211,9 +214,10 @@ task:
 task:
   name: 'ARM64 Android APK [focal]'
   << : *DEPENDS_SDK_CACHE_TEMPLATE
+  << : *BASE_TEMPLATE
   depends_sources_cache:
     folder: "depends/sources"
-  << : *GLOBAL_TASK_TEMPLATE
+  << : *TASK_TEMPLATE
   container:
     image: ubuntu:focal
   env:

From f52a72af569526f319d9f1480eb473b9570125c3 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 16 Aug 2021 11:46:41 +0300
Subject: [PATCH 2/2] ci: Invalidate depends caches when sources have been
 changed

---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 178a9fc98..3e2e8864a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -40,6 +40,7 @@ task_template: &TASK_TEMPLATE
     folder: "/tmp/ccache_dir"
   depends_built_cache:
     folder: "depends/built"
+    fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
   ci_script:
     - ./ci/test_run_all.sh
 
@@ -217,6 +218,7 @@ task:
   << : *BASE_TEMPLATE
   depends_sources_cache:
     folder: "depends/sources"
+    fingerprint_script: git rev-list -1 HEAD ./depends
   << : *TASK_TEMPLATE
   container:
     image: ubuntu:focal