Swap to master

Author: jmagman

.cirrus.yml

@@ -12,14 +12,14 @@ flutter_template: &FLUTTER_TEMPLATE
     - date
 
 flutter_master_template: &FLUTTER_MASTER_TEMPLATE
+  << : *FLUTTER_TEMPLATE
   environment:
     CHANNEL: "master"
-  << : *FLUTTER_TEMPLATE
 
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
+  << : *FLUTTER_TEMPLATE
   environment:
     CHANNEL: "stable"
-  << : *FLUTTER_TEMPLATE
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   << : *FLUTTER_STABLE_TEMPLATE
@@ -28,6 +28,24 @@ flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
     # https://github.com/flutter/flutter/issues/42864
     - find . | grep _web$ | xargs rm -rf
 
+# fingerprint_script doesn't seem to work in templates.
+# To keep OS caches from colliding, split them into separate caches.
+cache_stable_linux_template: &CACHE_STABLE_LINUX_TEMPLATE
+  pub_linux_cache:
+    folder: $HOME/.pub-cache
+  flutter_pkg_linux_cache:
+    folder: $FLUTTER_HOME/bin/cache/pkg
+  flutter_artifacts_linux_cache:
+    folder: $FLUTTER_HOME/bin/cache/artifacts
+
+cache_stable_macos_template: &CACHE_STABLE_MACOS_TEMPLATE
+  pub_macos_cache:
+    folder: $HOME/.pub-cache
+  flutter_pkg_macos_cache:
+    folder: $FLUTTER_HOME/bin/cache/pkg
+  flutter_artifacts_macos_cache:
+    folder: $FLUTTER_HOME/bin/cache/artifacts
+
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
@@ -38,22 +56,14 @@ task:
     PATH: $PATH:$HOME/.pub-cache/bin
   matrix:
     - name: publishable
+      << : *CACHE_STABLE_LINUX_TEMPLATE
       << : *FLUTTER_STABLE_TEMPLATE
       script:
         - date
         - ./script/check_publish.sh
         - date
     - name: format
-      pub_cache:
-        folder: $HOME/.pub-cache
-        fingerprint_script: echo $CIRRUS_OS
-      flutter_pkg_cache:
-        folder: $FLUTTER_HOME/bin/cache/pkg
-        fingerprint_script: echo $CIRRUS_OS; cat $FLUTTER_HOME/bin/internal/*.version
-      flutter_artifacts_cache:
-        folder: $FLUTTER_HOME/bin/cache/artifacts
-        fingerprint_script: echo $CIRRUS_OS; cat $FLUTTER_HOME/bin/internal/*.version
-      << : *FLUTTER_STABLE_TEMPLATE
+      << : *FLUTTER_MASTER_TEMPLATE
       install_script:
         - date
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
@@ -68,18 +78,20 @@ task:
     - name: test
       matrix:
         - << : *FLUTTER_MASTER_TEMPLATE
-        - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+        - << : *CACHE_STABLE_LINUX_TEMPLATE
+          << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       test_script:
         - date
         - ./script/incremental_build.sh test
         - date
     - name: analyze
-      << : *FLUTTER_STABLE_TEMPLATE
+      << : *FLUTTER_MASTER_TEMPLATE
       script:
         - date
         - ./script/incremental_build.sh analyze
         - date        
     - name: build_all_plugins_apk
+      << : *CACHE_STABLE_LINUX_TEMPLATE
       << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       script:
         - date
@@ -94,7 +106,8 @@ task:
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
           - << : *FLUTTER_MASTER_TEMPLATE
-          - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - << : *CACHE_STABLE_LINUX_TEMPLATE
+            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -137,12 +150,14 @@ task:
     - date
   matrix:
     - name: build_all_plugins_ipa
+      << : *CACHE_STABLE_MACOS_TEMPLATE
       << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       script:
         - date
         - ./script/build_all_plugins_app.sh ios --no-codesign
         - date
     - name: lint_darwin_plugins
+      << : *CACHE_STABLE_MACOS_TEMPLATE
       << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       script:
         - date
@@ -157,7 +172,8 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           - << : *FLUTTER_MASTER_TEMPLATE
-          - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - << : *CACHE_STABLE_MACOS_TEMPLATE
+            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date