Merge 8c867ed4ec into merged_master (Bitcoin PR #21675)

.cirrus.yml

@@ -42,11 +42,13 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
     folder: "/tmp/ccache_dir"
   depends_built_cache:
     folder: "depends/built"
-  depends_sdk_cache:
-    folder: "depends/sdk-sources"
   ci_script:
     - ./ci/test_run_all.sh
 
+depends_sdk_cache_template: &DEPENDS_SDK_CACHE_TEMPLATE
+  depends_sdk_cache:
+    folder: "depends/sdk-sources"
+
 compute_credits_template: &CREDITS_TEMPLATE
   # https://cirrus-ci.org/pricing/#compute-credits
   # Only use credits for pull requests to the main repo
@@ -183,6 +185,7 @@ task:
 
 task:
   name: 'macOS 10.14 [gui, no tests] [focal]'
+  << : *DEPENDS_SDK_CACHE_TEMPLATE
   << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:focal
@@ -207,6 +210,7 @@ task:
 
 task:
   name: 'ARM64 Android APK [focal]'
+  << : *DEPENDS_SDK_CACHE_TEMPLATE
   depends_sources_cache:
     folder: "depends/sources"
   << : *GLOBAL_TASK_TEMPLATE