From 507c44acf04194dbb4dac7dbd39bde561ca157b9 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 5 Dec 2019 14:41:34 -0800
Subject: [PATCH 01/35] Remove pod setup

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

diff --git a/.cirrus.yml b/.cirrus.yml
index af37fc630c2f..ffc7ac89e222 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -82,9 +82,14 @@ task:
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: mojave-xcode-11.2.1-flutter
+    image: mojave-flutter
+  environment:
+    COCOAPODS_DISABLE_STATS: true
+    PATH: $PATH:/usr/local/bin
   setup_script:
-    - pod repo update
+    - pod --version
+    - sudo gem list cocoapods
+    - pod repo remove master
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
@@ -107,7 +112,6 @@ task:
       script: ./script/lint_darwin_plugins.sh
     - name: build-ipas+drive-examples
       env:
-        PATH: $PATH:/usr/local/bin
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"

From 1206251c41c3b8c6edc4b01ce4a57d31c91af899 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 5 Dec 2019 17:23:14 -0800
Subject: [PATCH 02/35] Remove repo remove

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ffc7ac89e222..0958a5043d94 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -89,7 +89,6 @@ task:
   setup_script:
     - pod --version
     - sudo gem list cocoapods
-    - pod repo remove master
   upgrade_script:
     - flutter channel stable
     - flutter upgrade

From e9cd4ef057841d24e63b66b54582c892704903e0 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 12:53:01 -0800
Subject: [PATCH 03/35] Rearrange .cirrus script, add cache

---
 .cirrus.yml | 154 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 102 insertions(+), 52 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 0958a5043d94..b1036c88dee6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,63 +1,111 @@
+pub_cache:
+  folder: $HOME/.pub-cache
+  fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
+upgrade_script:
+  - date
+  - git fetch origin master
+  - date
+activate_script: 
+  - date
+  - pub global activate flutter_plugin_tools
+  - date
+
+flutter_master_template: &FLUTTER_MASTER_TEMPLATE
+  environment:
+    CHANNEL: "master"
+  upgrade_script:
+    - date
+    - flutter channel $CHANNEL
+    - flutter upgrade
+    - date
+
+flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
+  environment:
+    CHANNEL: "stable"
+  flutter_artifacts_cache:
+    folder: ${FLUTTER_HOME}/bin/cache/artifacts
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  flutter_pkg_cache:
+    folder: ${FLUTTER_HOME}/bin/cache/pkg
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  upgrade_script:
+    - date
+    - flutter channel $CHANNEL
+    - flutter upgrade
+    - date
+
+flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+  << : *FLUTTER_STABLE_TEMPLATE
+  test_script:
+    # TODO(jackson): Allow web plugins once supported on stable
+    # https://github.com/flutter/flutter/issues/42864
+    - find . | grep _web$ | xargs rm -rf; fi
+
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
     dockerfile: .ci/Dockerfile
     cpu: 8
     memory: 16G
-  upgrade_script:
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
+      << : *FLUTTER_STABLE_TEMPLATE
       script:
-        - flutter channel stable
+        - date
         - ./script/check_publish.sh
+        - date
     - name: format
+      << : *FLUTTER_STABLE_TEMPLATE
       install_script:
+        - date
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
         - sudo apt-get update
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
-      format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
+        - date
+      format_script:
+        - date
+        - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
+        - date
     - name: test
-      env:
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
+      matrix:
+        - name: master
+        << : *FLUTTER_MASTER_TEMPLATE
+        - name: stable
+        << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       test_script:
-        # TODO(jackson): Allow web plugins once supported on stable
-        # https://github.com/flutter/flutter/issues/42864
-        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
-        - flutter channel $CHANNEL
+        - date
         - ./script/incremental_build.sh test
+        - date
     - name: analyze
-      script: ./script/incremental_build.sh analyze
+      << : *FLUTTER_STABLE_TEMPLATE
+      script:
+        - date
+        - ./script/incremental_build.sh analyze
+        - date        
     - name: build_all_plugins_apk
+      << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       script:
-        # TODO(jackson): Allow web plugins once supported on stable
-        # https://github.com/flutter/flutter/issues/42864
-        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
-        - flutter channel $CHANNEL
+        - date
         - ./script/build_all_plugins_app.sh apk
+        - date
+      depends_on:
+        - format
+        - publishable
     - name: build-apks+java-test+firebase-test-lab
-      env:
+      environment:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
+          - name: master
+            << : *FLUTTER_MASTER_TEMPLATE
+          - name: stable
+            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
-        # TODO(jackson): Allow web plugins once supported on stable
-        # https://github.com/flutter/flutter/issues/42864
-        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
-        - flutter channel $CHANNEL
+        - date
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
         # See: https://github.com/flutter/flutter/issues/24935
@@ -78,6 +126,10 @@ task:
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
+        - date
+      depends_on:
+        - format
+        - publishable
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
@@ -86,44 +138,42 @@ task:
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin
-  setup_script:
-    - pod --version
-    - sudo gem list cocoapods
-  upgrade_script:
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
   create_simulator_script:
+    - date
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
+    - date
   matrix:
     - name: build_all_plugins_ipa
+      << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       script:
-        # TODO(jackson): Allow web plugins once supported on stable
-        # https://github.com/flutter/flutter/issues/42864
-        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
-        - flutter channel $CHANNEL
+        - date
         - ./script/build_all_plugins_app.sh ios --no-codesign
+        - date
     - name: lint_darwin_plugins
-      script: ./script/lint_darwin_plugins.sh
+      << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+      script:
+        - date
+        - ./script/lint_darwin_plugins.sh
+        - date
     - name: build-ipas+drive-examples
-      env:
+      environment:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
+          - name: master
+            << : *FLUTTER_MASTER_TEMPLATE
+          - name: stable
+            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
-      build_script:
-        # TODO(jackson): Allow web plugins once supported on stable
-        # https://github.com/flutter/flutter/issues/42864
-        - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
-        - flutter channel $CHANNEL
+      script:
+        - date
         - ./script/incremental_build.sh build-examples --ipa
         - ./script/incremental_build.sh drive-examples
+        - date
+  depends_on:
+    - format
+    - publishable

From 426532b03288625409da5a5470472966729e0e54 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 12:55:19 -0800
Subject: [PATCH 04/35] Indent

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

diff --git a/.cirrus.yml b/.cirrus.yml
index b1036c88dee6..7359ca51ba8f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -70,9 +70,9 @@ task:
     - name: test
       matrix:
         - name: master
-        << : *FLUTTER_MASTER_TEMPLATE
+          << : *FLUTTER_MASTER_TEMPLATE
         - name: stable
-        << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       test_script:
         - date
         - ./script/incremental_build.sh test

From 5d75a70176d832ea6e71aa6e96fd83e18632e61d Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 12:59:00 -0800
Subject: [PATCH 05/35] {

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 7359ca51ba8f..1ec330bcf62d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,10 +23,10 @@ flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
   flutter_artifacts_cache:
-    folder: ${FLUTTER_HOME}/bin/cache/artifacts
+    folder: $FLUTTER_HOME/bin/cache/artifacts
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   flutter_pkg_cache:
-    folder: ${FLUTTER_HOME}/bin/cache/pkg
+    folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
     - date

From b66e3c8af822403a26bb2fbc9931b09acb1cf58e Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:04:06 -0800
Subject: [PATCH 06/35] Remove cache

---
 .cirrus.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1ec330bcf62d..b4eccbd23213 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 pub_cache:
   folder: $HOME/.pub-cache
   fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
-upgrade_script:
+setup_script:
   - date
   - git fetch origin master
   - date
@@ -13,8 +13,9 @@ activate_script:
 flutter_master_template: &FLUTTER_MASTER_TEMPLATE
   environment:
     CHANNEL: "master"
-  upgrade_script:
+  setup_script:
     - date
+    - which flutter
     - flutter channel $CHANNEL
     - flutter upgrade
     - date
@@ -22,13 +23,10 @@ flutter_master_template: &FLUTTER_MASTER_TEMPLATE
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
-  flutter_artifacts_cache:
-    folder: $FLUTTER_HOME/bin/cache/artifacts
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   flutter_pkg_cache:
     folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
-  upgrade_script:
+  setup_script:
     - date
     - flutter channel $CHANNEL
     - flutter upgrade
@@ -36,7 +34,7 @@ flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   << : *FLUTTER_STABLE_TEMPLATE
-  test_script:
+  setup_script:
     # TODO(jackson): Allow web plugins once supported on stable
     # https://github.com/flutter/flutter/issues/42864
     - find . | grep _web$ | xargs rm -rf; fi

From eac53651c5dcec4737410ebc51cfba52186d3e43 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:04:51 -0800
Subject: [PATCH 07/35] Remove cache

---
 .cirrus.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index b4eccbd23213..791f5c98b689 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,9 +23,6 @@ flutter_master_template: &FLUTTER_MASTER_TEMPLATE
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
-  flutter_pkg_cache:
-    folder: $FLUTTER_HOME/bin/cache/pkg
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   setup_script:
     - date
     - flutter channel $CHANNEL

From 436aad4121d582d214f5576279ab9c46af355e8e Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:06:08 -0800
Subject: [PATCH 08/35] Rename script

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 791f5c98b689..5b2accc4a79a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 pub_cache:
   folder: $HOME/.pub-cache
   fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
-setup_script:
+fetch_plugins_script:
   - date
   - git fetch origin master
   - date
@@ -31,7 +31,7 @@ flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   << : *FLUTTER_STABLE_TEMPLATE
-  setup_script:
+  remove_web_plugins_script:
     # TODO(jackson): Allow web plugins once supported on stable
     # https://github.com/flutter/flutter/issues/42864
     - find . | grep _web$ | xargs rm -rf; fi

From c95c9d210170f64ce6bfd621f7c296820e41748b Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:09:50 -0800
Subject: [PATCH 09/35] BASE_TASK_TEMPLATE

---
 .cirrus.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5b2accc4a79a..300c39b7dc09 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,14 +1,13 @@
-pub_cache:
-  folder: $HOME/.pub-cache
-  fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
-fetch_plugins_script:
-  - date
-  - git fetch origin master
-  - date
-activate_script: 
-  - date
-  - pub global activate flutter_plugin_tools
-  - date
+base_task_template: &BASE_TASK_TEMPLATE
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
+  upgrade_script:
+    - date
+    - git fetch origin master
+    - date
+    - pub global activate flutter_plugin_tools
+    - date
 
 flutter_master_template: &FLUTTER_MASTER_TEMPLATE
   environment:
@@ -42,6 +41,7 @@ task:
     dockerfile: .ci/Dockerfile
     cpu: 8
     memory: 16G
+  << : *BASE_TASK_TEMPLATE
   matrix:
     - name: publishable
       << : *FLUTTER_STABLE_TEMPLATE
@@ -130,6 +130,7 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
     image: mojave-flutter
+  << : *BASE_TASK_TEMPLATE
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin

From 3a1ff30ba815dc44cdc3ae41c92560b80d70b4eb Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:11:28 -0800
Subject: [PATCH 10/35] Remove CIRRUS_WORKING_DIR

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 300c39b7dc09..3b830dccf3e2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 base_task_template: &BASE_TASK_TEMPLATE
   pub_cache:
     folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' "$CIRRUS_WORKING_DIR"
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' .
   upgrade_script:
     - date
     - git fetch origin master

From fc3c4ad2d97dc60a20c89b1866745a7062267c4d Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:31:05 -0800
Subject: [PATCH 11/35] Change fingerprint

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 3b830dccf3e2..4c529ff0cf41 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,4 @@
 base_task_template: &BASE_TASK_TEMPLATE
-  pub_cache:
-    folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml 'PUBSPEC CHECKSUM' .
   upgrade_script:
     - date
     - git fetch origin master
@@ -22,6 +19,9 @@ flutter_master_template: &FLUTTER_MASTER_TEMPLATE
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml "\:.*[0-9]\+"\. . | grep -v version | grep -v flutter | xargs
   setup_script:
     - date
     - flutter channel $CHANNEL

From 9f3531779f66eafd906ef360f604ab15c92ddd80 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:34:19 -0800
Subject: [PATCH 12/35] single

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 4c529ff0cf41..a1ad033b89f9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -21,7 +21,7 @@ flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
     CHANNEL: "stable"
   pub_cache:
     folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml "\:.*[0-9]\+"\. . | grep -v version | grep -v flutter | xargs
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
   setup_script:
     - date
     - flutter channel $CHANNEL

From 918adf9c871e2fcf39fdcaef8beb239a1274e77e Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:35:58 -0800
Subject: [PATCH 13/35] fingerprint

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a1ad033b89f9..e29e4f28f504 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -21,7 +21,6 @@ flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
     CHANNEL: "stable"
   pub_cache:
     folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
   setup_script:
     - date
     - flutter channel $CHANNEL

From 54e4bbee8b30be5e426702b2d9d5a39e3a8f79d4 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:48:19 -0800
Subject: [PATCH 14/35] FLUTTER_TEMPLATE

---
 .cirrus.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e29e4f28f504..d9ed14fea967 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,31 +1,31 @@
-base_task_template: &BASE_TASK_TEMPLATE
+flutter_template: &FLUTTER_TEMPLATE
   upgrade_script:
     - date
+    - which flutter
+    - flutter channel $CHANNEL
+    - flutter upgrade
     - git fetch origin master
-    - date
     - pub global activate flutter_plugin_tools
     - date
 
 flutter_master_template: &FLUTTER_MASTER_TEMPLATE
   environment:
     CHANNEL: "master"
-  setup_script:
-    - date
-    - which flutter
-    - flutter channel $CHANNEL
-    - flutter upgrade
-    - date
+  << : *FLUTTER_TEMPLATE
 
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
   pub_cache:
     folder: $HOME/.pub-cache
-  setup_script:
-    - date
-    - flutter channel $CHANNEL
-    - flutter upgrade
-    - date
+    fingerprint_script: echo $CIRRUS_OS
+  flutter_pkg_cache:
+    folder: $FLUTTER_HOME/bin/cache/pkg
+    fingerprint_script: echo $CIRRUS_OS
+  flutter_artifacts_cache:
+    folder: $FLUTTER_HOME/bin/cache/artifacts
+    fingerprint_script: echo $CIRRUS_OS
+  << : *FLUTTER_TEMPLATE
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   << : *FLUTTER_STABLE_TEMPLATE
@@ -40,7 +40,6 @@ task:
     dockerfile: .ci/Dockerfile
     cpu: 8
     memory: 16G
-  << : *BASE_TASK_TEMPLATE
   matrix:
     - name: publishable
       << : *FLUTTER_STABLE_TEMPLATE

From 153db2b8ffdfef1517c8fcafb5a66c190e99af41 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:49:35 -0800
Subject: [PATCH 15/35] BASE_TASK_TEMPLATE

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d9ed14fea967..d99b00e2be7f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -128,7 +128,6 @@ task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
     image: mojave-flutter
-  << : *BASE_TASK_TEMPLATE
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin

From 5294d39603d014f1134e0f30c48625891faf72e0 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 13:57:49 -0800
Subject: [PATCH 16/35] Test fingerprint_script outside of template

---
 .cirrus.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d99b00e2be7f..35201a30fb7a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,9 +1,10 @@
 flutter_template: &FLUTTER_TEMPLATE
   upgrade_script:
-    - date
     - which flutter
     - flutter channel $CHANNEL
+    - date
     - flutter upgrade
+    - date
     - git fetch origin master
     - pub global activate flutter_plugin_tools
     - date
@@ -16,15 +17,6 @@ flutter_master_template: &FLUTTER_MASTER_TEMPLATE
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
   environment:
     CHANNEL: "stable"
-  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
-  flutter_artifacts_cache:
-    folder: $FLUTTER_HOME/bin/cache/artifacts
-    fingerprint_script: echo $CIRRUS_OS
   << : *FLUTTER_TEMPLATE
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
@@ -48,6 +40,15 @@ task:
         - ./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
       install_script:
         - date

From e3ced2adb07be03ac6645fceee4419e5b3e9d62d Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:13:52 -0800
Subject: [PATCH 17/35] extension-methods

---
 .cirrus.yml           | 26 ++++++++++++--------------
 analysis_options.yaml |  2 ++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 35201a30fb7a..be7a6d82a9cc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,8 +4,10 @@ flutter_template: &FLUTTER_TEMPLATE
     - flutter channel $CHANNEL
     - date
     - flutter upgrade
-    - date
     - git fetch origin master
+    - date
+  activate_script:
+    - date
     - pub global activate flutter_plugin_tools
     - date
 
@@ -32,6 +34,8 @@ task:
     dockerfile: .ci/Dockerfile
     cpu: 8
     memory: 16G
+  environment:
+    PATH: $PATH:$HOME/.pub-cache/bin
   matrix:
     - name: publishable
       << : *FLUTTER_STABLE_TEMPLATE
@@ -63,10 +67,8 @@ task:
         - date
     - name: test
       matrix:
-        - name: master
-          << : *FLUTTER_MASTER_TEMPLATE
-        - name: stable
-          << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+        - << : *FLUTTER_MASTER_TEMPLATE
+        - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
       test_script:
         - date
         - ./script/incremental_build.sh test
@@ -92,10 +94,8 @@ task:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
-          - name: master
-            << : *FLUTTER_MASTER_TEMPLATE
-          - name: stable
-            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - << : *FLUTTER_MASTER_TEMPLATE
+          - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -131,7 +131,7 @@ task:
     image: mojave-flutter
   environment:
     COCOAPODS_DISABLE_STATS: true
-    PATH: $PATH:/usr/local/bin
+    PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
   create_simulator_script:
     - date
     - xcrun simctl list
@@ -158,10 +158,8 @@ task:
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
-          - name: master
-            << : *FLUTTER_MASTER_TEMPLATE
-          - name: stable
-            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - << : *FLUTTER_MASTER_TEMPLATE
+          - << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date
diff --git a/analysis_options.yaml b/analysis_options.yaml
index b1261f36fac9..0f024cb58cb7 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -4,6 +4,8 @@ analyzer:
     # Ignore generated files
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
+  enable-experiment:
+    - extension-methods
 linter:
   rules:
     - public_member_api_docs

From 0d181534a93934a56680c8d1e6d26b24108113b9 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:17:03 -0800
Subject: [PATCH 18/35] **

---
 analysis_options.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 0f024cb58cb7..fb4ff182a5c7 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -3,7 +3,7 @@ analyzer:
   exclude:
     # Ignore generated files
     - '**/*.g.dart'
-    - 'lib/src/generated/*.dart'
+    - '**/lib/src/generated/*.dart'
   enable-experiment:
     - extension-methods
 linter:

From 3cf307def10caa889b1216234ab2a8e69e14a850 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:18:40 -0800
Subject: [PATCH 19/35] fi

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

diff --git a/.cirrus.yml b/.cirrus.yml
index be7a6d82a9cc..35d52bfdf235 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -26,7 +26,7 @@ flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   remove_web_plugins_script:
     # TODO(jackson): Allow web plugins once supported on stable
     # https://github.com/flutter/flutter/issues/42864
-    - find . | grep _web$ | xargs rm -rf; fi
+    - find . | grep _web$ | xargs rm -rf
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''

From 860f5a110824333992458863dbcf50ab3834551e Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:27:35 -0800
Subject: [PATCH 20/35] Remove format dependency

---
 .cirrus.yml           | 3 ---
 analysis_options.yaml | 2 --
 2 files changed, 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 35d52bfdf235..57d162f4844a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -86,7 +86,6 @@ task:
         - ./script/build_all_plugins_app.sh apk
         - date
       depends_on:
-        - format
         - publishable
     - name: build-apks+java-test+firebase-test-lab
       environment:
@@ -122,7 +121,6 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
         - date
       depends_on:
-        - format
         - publishable
 
 task:
@@ -167,5 +165,4 @@ task:
         - ./script/incremental_build.sh drive-examples
         - date
   depends_on:
-    - format
     - publishable
diff --git a/analysis_options.yaml b/analysis_options.yaml
index fb4ff182a5c7..997c7ec8b718 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -4,8 +4,6 @@ analyzer:
     # Ignore generated files
     - '**/*.g.dart'
     - '**/lib/src/generated/*.dart'
-  enable-experiment:
-    - extension-methods
 linter:
   rules:
     - public_member_api_docs

From ac73cd0683ed855ab04a179f105d840b28f984cc Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:43:11 -0800
Subject: [PATCH 21/35] Swap to master

---
 .cirrus.yml | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 57d162f4844a..466005d61dfa 100644
--- a/.cirrus.yml
+++ b/.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

From 693b1bf800c3ce678e50e37f9aefee3de3adace8 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 14:49:07 -0800
Subject: [PATCH 22/35] FLUTTER_TEMPLATE

---
 .cirrus.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 466005d61dfa..468bf07d0b2b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,4 +1,6 @@
-flutter_template: &FLUTTER_TEMPLATE
+flutter_master_template: &FLUTTER_MASTER_TEMPLATE
+  environment:
+    CHANNEL: "master"
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL
@@ -11,15 +13,20 @@ flutter_template: &FLUTTER_TEMPLATE
     - pub global activate flutter_plugin_tools
     - date
 
-flutter_master_template: &FLUTTER_MASTER_TEMPLATE
-  << : *FLUTTER_TEMPLATE
-  environment:
-    CHANNEL: "master"
-
 flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
-  << : *FLUTTER_TEMPLATE
   environment:
     CHANNEL: "stable"
+  upgrade_script:
+    - which flutter
+    - flutter channel $CHANNEL
+    - date
+    - flutter upgrade
+    - git fetch origin master
+    - date
+  activate_script:
+    - date
+    - pub global activate flutter_plugin_tools
+    - date
 
 flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
   << : *FLUTTER_STABLE_TEMPLATE
@@ -98,6 +105,7 @@ task:
         - ./script/build_all_plugins_app.sh apk
         - date
       depends_on:
+        - analyze
         - publishable
     - name: build-apks+java-test+firebase-test-lab
       environment:
@@ -134,6 +142,7 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
         - date
       depends_on:
+        - analyze
         - publishable
 
 task:
@@ -181,4 +190,5 @@ task:
         - ./script/incremental_build.sh drive-examples
         - date
   depends_on:
+    - analyze
     - publishable

From 1f436b5474c74f994617d29d214cb848171fc891 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:11:09 -0800
Subject: [PATCH 23/35] Reduce number of templates

---
 .cirrus.yml | 116 ++++++++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 67 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 468bf07d0b2b..d725a1ffdd18 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,35 +1,4 @@
-flutter_master_template: &FLUTTER_MASTER_TEMPLATE
-  environment:
-    CHANNEL: "master"
-  upgrade_script:
-    - which flutter
-    - flutter channel $CHANNEL
-    - date
-    - flutter upgrade
-    - git fetch origin master
-    - date
-  activate_script:
-    - date
-    - pub global activate flutter_plugin_tools
-    - date
-
-flutter_stable_template: &FLUTTER_STABLE_TEMPLATE
-  environment:
-    CHANNEL: "stable"
-  upgrade_script:
-    - which flutter
-    - flutter channel $CHANNEL
-    - date
-    - flutter upgrade
-    - git fetch origin master
-    - date
-  activate_script:
-    - date
-    - pub global activate flutter_plugin_tools
-    - date
-
-flutter_stable_skip_web_template: &FLUTTER_STABLE_SKIP_WEB_TEMPLATE
-  << : *FLUTTER_STABLE_TEMPLATE
+flutter_skip_web_template: &FLUTTER_SKIP_WEB_TEMPLATE
   remove_web_plugins_script:
     # TODO(jackson): Allow web plugins once supported on stable
     # https://github.com/flutter/flutter/issues/42864
@@ -61,16 +30,23 @@ task:
     memory: 16G
   environment:
     PATH: $PATH:$HOME/.pub-cache/bin
+    CHANNEL: "stable" # Default to flutter stable to leverage caching.
+  upgrade_script:
+    - which flutter
+    - flutter channel $CHANNEL
+    - date
+    - flutter upgrade
+    - git fetch origin master
+    - date
+  activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
       << : *CACHE_STABLE_LINUX_TEMPLATE
-      << : *FLUTTER_STABLE_TEMPLATE
       script:
-        - date
         - ./script/check_publish.sh
-        - date
     - name: format
-      << : *FLUTTER_MASTER_TEMPLATE
+      environment:
+         CHANNEL: "master"
       install_script:
         - date
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
@@ -79,33 +55,29 @@ task:
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
         - date
       format_script:
-        - date
         - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
-        - date
     - name: test
-      matrix:
-        - << : *FLUTTER_MASTER_TEMPLATE
-        - << : *CACHE_STABLE_LINUX_TEMPLATE
-          << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+        matrix:
+          - environment:
+              CHANNEL: "master"
+          - environment:
+              CHANNEL: "stable"
+            << : *CACHE_STABLE_LINUX_TEMPLATE
+            << : *FLUTTER_SKIP_WEB_TEMPLATE
       test_script:
-        - date
         - ./script/incremental_build.sh test
-        - date
     - name: analyze
-      << : *FLUTTER_MASTER_TEMPLATE
+      environment:
+         CHANNEL: "master"
       script:
-        - date
         - ./script/incremental_build.sh analyze
-        - date        
     - name: build_all_plugins_apk
       << : *CACHE_STABLE_LINUX_TEMPLATE
-      << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+      << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
-        - date
         - ./script/build_all_plugins_app.sh apk
-        - date
       depends_on:
-        - analyze
+        - format
         - publishable
     - name: build-apks+java-test+firebase-test-lab
       environment:
@@ -113,9 +85,12 @@ task:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
-          - << : *FLUTTER_MASTER_TEMPLATE
-          - << : *CACHE_STABLE_LINUX_TEMPLATE
-            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - environment:
+              CHANNEL: "master"
+          - environment:
+              CHANNEL: "stable"
+            << : *CACHE_STABLE_LINUX_TEMPLATE
+            << : *FLUTTER_SKIP_WEB_TEMPLATE
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -142,7 +117,7 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
         - date
       depends_on:
-        - analyze
+        - format
         - publishable
 
 task:
@@ -152,26 +127,29 @@ task:
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
-  create_simulator_script:
+    CHANNEL: "stable" # Default to flutter stable to leverage caching.
+  upgrade_script:
+    - which flutter
+    - flutter channel $CHANNEL
     - date
+    - flutter upgrade
+    - git fetch origin master
+    - date
+  activate_script: pub global activate flutter_plugin_tools
+  create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
-    - date
   matrix:
     - name: build_all_plugins_ipa
       << : *CACHE_STABLE_MACOS_TEMPLATE
-      << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+      << : *FLUTTER_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
+      << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
-        - date
         - ./script/lint_darwin_plugins.sh
-        - date
     - name: build-ipas+drive-examples
       environment:
         matrix:
@@ -180,15 +158,19 @@ task:
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
-          - << : *FLUTTER_MASTER_TEMPLATE
-          - << : *CACHE_STABLE_MACOS_TEMPLATE
-            << : *FLUTTER_STABLE_SKIP_WEB_TEMPLATE
+          - environment:
+              CHANNEL: "master"
+          - environment:
+              CHANNEL: "stable"
+            << : *CACHE_STABLE_MACOS_TEMPLATE
+            << : *FLUTTER_SKIP_WEB_TEMPLATE
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date
         - ./script/incremental_build.sh build-examples --ipa
+        - date
         - ./script/incremental_build.sh drive-examples
         - date
   depends_on:
-    - analyze
+    - format
     - publishable

From 98423d423ea21b19fb55b2b53a2eeaf0399615f5 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:15:46 -0800
Subject: [PATCH 24/35] Rearrange matrix

---
 .cirrus.yml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d725a1ffdd18..8a5bd2b2f072 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -58,12 +58,15 @@ task:
         - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
         matrix:
-          - environment:
-              CHANNEL: "master"
-          - environment:
-              CHANNEL: "stable"
+          - name: test-master 
             << : *CACHE_STABLE_LINUX_TEMPLATE
+            environment:
+              CHANNEL: "master"
+          - name: test-stable 
             << : *FLUTTER_SKIP_WEB_TEMPLATE
+            environment:
+              CHANNEL: "stable"
+            
       test_script:
         - ./script/incremental_build.sh test
     - name: analyze
@@ -85,12 +88,14 @@ task:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
-          - environment:
-              CHANNEL: "master"
-          - environment:
-              CHANNEL: "stable"
+          - name: test-master 
             << : *CACHE_STABLE_LINUX_TEMPLATE
+            environment:
+              CHANNEL: "master"
+          - name: test-stable 
             << : *FLUTTER_SKIP_WEB_TEMPLATE
+            environment:
+              CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -158,12 +163,14 @@ task:
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
-          - environment:
-              CHANNEL: "master"
-          - environment:
-              CHANNEL: "stable"
+          - name: test-master 
             << : *CACHE_STABLE_MACOS_TEMPLATE
+            environment:
+              CHANNEL: "master"
+          - name: test-stable 
             << : *FLUTTER_SKIP_WEB_TEMPLATE
+            environment:
+              CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date

From fac97be1e58941733d3ca6c845d929521f423b37 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:18:05 -0800
Subject: [PATCH 25/35] Try only_if

---
 .cirrus.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8a5bd2b2f072..e4bf0517260c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,6 +22,15 @@ cache_stable_macos_template: &CACHE_STABLE_MACOS_TEMPLATE
   flutter_artifacts_macos_cache:
     folder: $FLUTTER_HOME/bin/cache/artifacts
 
+pub_linux_cache:
+  folder: $HOME/.pub-cache
+  fingerprint_script: echo $CIRRUS_OS
+  only_if: $CHANNEL == "stable"
+
+flutter_pkg_linux_cache:
+  folder: $FLUTTER_HOME/bin/cache/pkg
+flutter_artifacts_linux_cache:
+  folder: $FLUTTER_HOME/bin/cache/artifacts
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
@@ -59,11 +68,9 @@ task:
     - name: test
         matrix:
           - name: test-master 
-            << : *CACHE_STABLE_LINUX_TEMPLATE
             environment:
               CHANNEL: "master"
           - name: test-stable 
-            << : *FLUTTER_SKIP_WEB_TEMPLATE
             environment:
               CHANNEL: "stable"
             
@@ -89,11 +96,9 @@ task:
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
           - name: test-master 
-            << : *CACHE_STABLE_LINUX_TEMPLATE
             environment:
               CHANNEL: "master"
           - name: test-stable 
-            << : *FLUTTER_SKIP_WEB_TEMPLATE
             environment:
               CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
@@ -164,11 +169,9 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           - name: test-master 
-            << : *CACHE_STABLE_MACOS_TEMPLATE
             environment:
               CHANNEL: "master"
           - name: test-stable 
-            << : *FLUTTER_SKIP_WEB_TEMPLATE
             environment:
               CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]

From 9121781bfbbdbdc0044a9a46c5fcc33373e8e985 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:19:32 -0800
Subject: [PATCH 26/35] Rearrange matrix

---
 .cirrus.yml | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e4bf0517260c..3966b9a8a035 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -66,13 +66,10 @@ task:
       format_script:
         - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
-        matrix:
-          - name: test-master 
-            environment:
-              CHANNEL: "master"
-          - name: test-stable 
-            environment:
-              CHANNEL: "stable"
+        environment:
+          matrix:
+            CHANNEL: "master"
+            CHANNEL: "stable"
             
       test_script:
         - ./script/incremental_build.sh test
@@ -94,13 +91,10 @@ task:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
-        matrix:
-          - name: test-master 
-            environment:
-              CHANNEL: "master"
-          - name: test-stable 
-            environment:
-              CHANNEL: "stable"
+        environment:
+          matrix:
+            CHANNEL: "master"
+            CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -167,13 +161,10 @@ task:
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
-        matrix:
-          - name: test-master 
-            environment:
-              CHANNEL: "master"
-          - name: test-stable 
-            environment:
-              CHANNEL: "stable"
+        environment:
+          matrix:
+            CHANNEL: "master"
+            CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date

From 8314d64ae32975b74db6ede7f7e95a17f5692b4f Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:21:42 -0800
Subject: [PATCH 27/35] Rearrange matrix

---
 .cirrus.yml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 3966b9a8a035..be57733b1b7d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -66,11 +66,10 @@ task:
       format_script:
         - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
-        environment:
-          matrix:
-            CHANNEL: "master"
-            CHANNEL: "stable"
-            
+      environment:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
       test_script:
         - ./script/incremental_build.sh test
     - name: analyze
@@ -91,10 +90,9 @@ task:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
-        environment:
-          matrix:
-            CHANNEL: "master"
-            CHANNEL: "stable"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
@@ -161,10 +159,9 @@ task:
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
-        environment:
-          matrix:
-            CHANNEL: "master"
-            CHANNEL: "stable"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
         - date

From 901cd92eb4be0f48d648eb8a564555fa7c6b224e Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:23:58 -0800
Subject: [PATCH 28/35] pub_cache

---
 .cirrus.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index be57733b1b7d..7da68a981c65 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,10 +22,6 @@ cache_stable_macos_template: &CACHE_STABLE_MACOS_TEMPLATE
   flutter_artifacts_macos_cache:
     folder: $FLUTTER_HOME/bin/cache/artifacts
 
-pub_linux_cache:
-  folder: $HOME/.pub-cache
-  fingerprint_script: echo $CIRRUS_OS
-  only_if: $CHANNEL == "stable"
 
 flutter_pkg_linux_cache:
   folder: $FLUTTER_HOME/bin/cache/pkg
@@ -40,6 +36,10 @@ task:
   environment:
     PATH: $PATH:$HOME/.pub-cache/bin
     CHANNEL: "stable" # Default to flutter stable to leverage caching.
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $CIRRUS_OS
+    only_if: $CHANNEL == "stable"
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL
@@ -130,6 +130,10 @@ task:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
     CHANNEL: "stable" # Default to flutter stable to leverage caching.
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $CIRRUS_OS
+    only_if: $CHANNEL == "stable"
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL

From d1f2ce4ac780cf0eed1a39d832fc78ea4e8280ed Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 15:36:54 -0800
Subject: [PATCH 29/35] Well only_if didn't work...

---
 .cirrus.yml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7da68a981c65..66162572f231 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@ flutter_skip_web_template: &FLUTTER_SKIP_WEB_TEMPLATE
   remove_web_plugins_script:
     # TODO(jackson): Allow web plugins once supported on stable
     # https://github.com/flutter/flutter/issues/42864
-    - find . | grep _web$ | xargs rm -rf
+    - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
 
 # fingerprint_script doesn't seem to work in templates.
 # To keep OS caches from colliding, split them into separate caches.
@@ -22,11 +22,6 @@ cache_stable_macos_template: &CACHE_STABLE_MACOS_TEMPLATE
   flutter_artifacts_macos_cache:
     folder: $FLUTTER_HOME/bin/cache/artifacts
 
-
-flutter_pkg_linux_cache:
-  folder: $FLUTTER_HOME/bin/cache/pkg
-flutter_artifacts_linux_cache:
-  folder: $FLUTTER_HOME/bin/cache/artifacts
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
   container:
@@ -35,11 +30,7 @@ task:
     memory: 16G
   environment:
     PATH: $PATH:$HOME/.pub-cache/bin
-    CHANNEL: "stable" # Default to flutter stable to leverage caching.
-  pub_cache:
-    folder: $HOME/.pub-cache
-    fingerprint_script: echo $CIRRUS_OS
-    only_if: $CHANNEL == "stable"
+    CHANNEL: "stable" # Default to flutter stable, tests can override.
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL
@@ -63,9 +54,9 @@ task:
         - sudo apt-get update
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
         - date
-      format_script:
-        - ./script/incremental_build.sh format --travis --clang-format=clang-format-7
+      format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
+      << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
         matrix:
           CHANNEL: "master"
@@ -86,6 +77,7 @@ task:
         - format
         - publishable
     - name: build-apks+java-test+firebase-test-lab
+      << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
@@ -129,11 +121,7 @@ task:
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
-    CHANNEL: "stable" # Default to flutter stable to leverage caching.
-  pub_cache:
-    folder: $HOME/.pub-cache
-    fingerprint_script: echo $CIRRUS_OS
-    only_if: $CHANNEL == "stable"
+    CHANNEL: "stable" # Default to flutter stable, tests can override.
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL
@@ -157,6 +145,7 @@ task:
       script:
         - ./script/lint_darwin_plugins.sh
     - name: build-ipas+drive-examples
+      << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"

From c643da54a0cc97a944e101ed6a46ae4bf51448c2 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 16:48:27 -0800
Subject: [PATCH 30/35] Cache all the things

---
 .cirrus.yml | 52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 66162572f231..c42802ec2feb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,24 +4,6 @@ flutter_skip_web_template: &FLUTTER_SKIP_WEB_TEMPLATE
     # https://github.com/flutter/flutter/issues/42864
     - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
 
-# 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:
@@ -31,29 +13,32 @@ task:
   environment:
     PATH: $PATH:$HOME/.pub-cache/bin
     CHANNEL: "stable" # Default to flutter stable, tests can override.
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
+  flutter_pkg_cache:
+    folder: $FLUTTER_HOME/bin/cache/pkg
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  flutter_artifacts_cache:
+    folder: $FLUTTER_HOME/bin/cache/artifacts
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
-    - which flutter
     - flutter channel $CHANNEL
-    - date
     - flutter upgrade
     - git fetch origin master
-    - date
   activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
-      << : *CACHE_STABLE_LINUX_TEMPLATE
       script:
         - ./script/check_publish.sh
     - name: format
       environment:
          CHANNEL: "master"
       install_script:
-        - date
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
         - sudo apt-get update
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
-        - date
       format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
       << : *FLUTTER_SKIP_WEB_TEMPLATE
@@ -69,7 +54,6 @@ task:
       script:
         - ./script/incremental_build.sh analyze
     - name: build_all_plugins_apk
-      << : *CACHE_STABLE_LINUX_TEMPLATE
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/build_all_plugins_app.sh apk
@@ -88,7 +72,6 @@ task:
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
-        - date
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
         # See: https://github.com/flutter/flutter/issues/24935
@@ -109,7 +92,6 @@ task:
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
-        - date
       depends_on:
         - format
         - publishable
@@ -122,25 +104,30 @@ task:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
     CHANNEL: "stable" # Default to flutter stable, tests can override.
+  pub_cache:
+    folder: $HOME/.pub-cache
+    fingerprint_script: echo $OS; echo $CHANNEL; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
+  flutter_pkg_cache:
+    folder: $FLUTTER_HOME/bin/cache/pkg
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  flutter_artifacts_cache:
+    folder: $FLUTTER_HOME/bin/cache/artifacts
+    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
     - which flutter
     - flutter channel $CHANNEL
-    - date
     - flutter upgrade
     - git fetch origin master
-    - date
   activate_script: pub global activate flutter_plugin_tools
   create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
-      << : *CACHE_STABLE_MACOS_TEMPLATE
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/build_all_plugins_app.sh ios --no-codesign
     - name: lint_darwin_plugins
-      << : *CACHE_STABLE_MACOS_TEMPLATE
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/lint_darwin_plugins.sh
@@ -157,11 +144,8 @@ task:
           CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       script:
-        - date
         - ./script/incremental_build.sh build-examples --ipa
-        - date
         - ./script/incremental_build.sh drive-examples
-        - date
   depends_on:
     - format
     - publishable

From bf81f697fdd9de0794102118bf5c587de81dd435 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 17:02:19 -0800
Subject: [PATCH 31/35] Add channel to fingerprint

---
 .cirrus.yml | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c42802ec2feb..70cde87f9d70 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,10 +12,9 @@ task:
     memory: 16G
   environment:
     PATH: $PATH:$HOME/.pub-cache/bin
-    CHANNEL: "stable" # Default to flutter stable, tests can override.
-  pub_cache:
-    folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
+    CHANNEL: "master" # Default to flutter master, tests can override.
+  channel_script:
+    - flutter channel $CHANNEL
   flutter_pkg_cache:
     folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -23,22 +22,22 @@ task:
     folder: $FLUTTER_HOME/bin/cache/artifacts
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
-    - flutter channel $CHANNEL
     - flutter upgrade
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools
   matrix:
     - name: publishable
+      environment:
+         CHANNEL: "stable"
       script:
         - ./script/check_publish.sh
     - name: format
-      environment:
-         CHANNEL: "master"
       install_script:
         - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         - sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
         - sudo apt-get update
         - sudo apt-get install -y --allow-unauthenticated clang-format-7
+        - dpkg -L clang-format-7
       format_script: ./script/incremental_build.sh format --travis --clang-format=clang-format-7
     - name: test
       << : *FLUTTER_SKIP_WEB_TEMPLATE
@@ -48,18 +47,20 @@ task:
           CHANNEL: "stable"
       test_script:
         - ./script/incremental_build.sh test
+      depends_on:
+        - publishable # Upload the stable cache first.
+        - format # Upload the master cache first.
     - name: analyze
-      environment:
-         CHANNEL: "master"
       script:
         - ./script/incremental_build.sh analyze
+      depends_on:
+        - format # Upload the master cache first.
     - name: build_all_plugins_apk
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/build_all_plugins_app.sh apk
       depends_on:
-        - format
-        - publishable
+        - format # Upload the master cache first.
     - name: build-apks+java-test+firebase-test-lab
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
@@ -93,8 +94,8 @@ task:
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
       depends_on:
-        - format
         - publishable
+        - format
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
@@ -103,10 +104,7 @@ task:
   environment:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
-    CHANNEL: "stable" # Default to flutter stable, tests can override.
-  pub_cache:
-    folder: $HOME/.pub-cache
-    fingerprint_script: echo $OS; echo $CHANNEL; grep -r --include=pubspec.yaml '\:.*[0-9]\+\.' . | grep -v 'version\|flutter\|sdk'| xargs
+    CHANNEL: "master" # Default to flutter master, tests can override.
   flutter_pkg_cache:
     folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -119,20 +117,20 @@ task:
     - flutter upgrade
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools
+  << : *FLUTTER_SKIP_WEB_TEMPLATE
   create_simulator_script:
     - xcrun simctl list
     - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
-      << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/build_all_plugins_app.sh ios --no-codesign
     - name: lint_darwin_plugins
-      << : *FLUTTER_SKIP_WEB_TEMPLATE
+      environment:
+         CHANNEL: "stable"
       script:
         - ./script/lint_darwin_plugins.sh
     - name: build-ipas+drive-examples
-      << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
@@ -146,6 +144,6 @@ task:
       script:
         - ./script/incremental_build.sh build-examples --ipa
         - ./script/incremental_build.sh drive-examples
-  depends_on:
-    - format
-    - publishable
+      depends_on:
+        - build_all_plugins_ipa # Upload the master cache first.
+        - lint_darwin_plugins # Upload the stable cache first.

From 773e81f125cb7c3b5179c8b984e8b6d325ada0af Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 17:22:23 -0800
Subject: [PATCH 32/35] channel_script

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 70cde87f9d70..0e27cbfa753f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -105,6 +105,8 @@ task:
     COCOAPODS_DISABLE_STATS: true
     PATH: $PATH:/usr/local/bin:$HOME/.pub-cache/bin
     CHANNEL: "master" # Default to flutter master, tests can override.
+  channel_script:
+    - flutter channel $CHANNEL
   flutter_pkg_cache:
     folder: $FLUTTER_HOME/bin/cache/pkg
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -112,8 +114,6 @@ task:
     folder: $FLUTTER_HOME/bin/cache/artifacts
     fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
-    - which flutter
-    - flutter channel $CHANNEL
     - flutter upgrade
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools

From 672030a6f197b0a490e7db768ffece6a8ceb0c97 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 17:41:45 -0800
Subject: [PATCH 33/35] Remove all caches

---
 .cirrus.yml | 56 +++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 0e27cbfa753f..60b7078daf3b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,12 +15,15 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
-  flutter_pkg_cache:
-    folder: $FLUTTER_HOME/bin/cache/pkg
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
-  flutter_artifacts_cache:
-    folder: $FLUTTER_HOME/bin/cache/artifacts
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # flutter_pkg_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/pkg
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # flutter_artifacts_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/artifacts
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # dart_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/dart-sdk
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
   upgrade_script:
     - flutter upgrade
     - git fetch origin master
@@ -47,20 +50,20 @@ task:
           CHANNEL: "stable"
       test_script:
         - ./script/incremental_build.sh test
-      depends_on:
-        - publishable # Upload the stable cache first.
-        - format # Upload the master cache first.
+      # depends_on:
+      #   - publishable # Upload the stable cache first.
+      #   - format # Upload the master cache first.
     - name: analyze
       script:
         - ./script/incremental_build.sh analyze
-      depends_on:
-        - format # Upload the master cache first.
+      # depends_on:
+      #   - format # Upload the master cache first.
     - name: build_all_plugins_apk
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       script:
         - ./script/build_all_plugins_app.sh apk
-      depends_on:
-        - format # Upload the master cache first.
+      # depends_on:
+      #   - format # Upload the master cache first.
     - name: build-apks+java-test+firebase-test-lab
       << : *FLUTTER_SKIP_WEB_TEMPLATE
       environment:
@@ -93,9 +96,9 @@ task:
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
-      depends_on:
-        - publishable
-        - format
+      # depends_on:
+      #   - publishable
+      #   - format
 
 task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
@@ -107,12 +110,15 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
-  flutter_pkg_cache:
-    folder: $FLUTTER_HOME/bin/cache/pkg
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
-  flutter_artifacts_cache:
-    folder: $FLUTTER_HOME/bin/cache/artifacts
-    fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # flutter_pkg_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/pkg
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # flutter_artifacts_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/artifacts
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
+  # dart_cache:
+  #   folder: $FLUTTER_HOME/bin/cache/dart-sdk
+  #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/cache/dart-sdk/revision
   upgrade_script:
     - flutter upgrade
     - git fetch origin master
@@ -144,6 +150,6 @@ task:
       script:
         - ./script/incremental_build.sh build-examples --ipa
         - ./script/incremental_build.sh drive-examples
-      depends_on:
-        - build_all_plugins_ipa # Upload the master cache first.
-        - lint_darwin_plugins # Upload the stable cache first.
+      # depends_on:
+      #   - build_all_plugins_ipa # Upload the master cache first.
+      #   - lint_darwin_plugins # Upload the stable cache first.

From d12b38da94fcd8f56ddd0c7de8f92414669e65d1 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 18:02:19 -0800
Subject: [PATCH 34/35] Clear flutter cache

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

diff --git a/.cirrus.yml b/.cirrus.yml
index 60b7078daf3b..dbf37ac3b318 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,6 +15,7 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
+    - if [[ -f "$FLUTTER_HOME" ]]; then rm -rf $FLUTTER_HOME/bin/cache/*; fi
   # flutter_pkg_cache:
   #   folder: $FLUTTER_HOME/bin/cache/pkg
   #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -110,6 +111,7 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
+    - if [[ -f "$FLUTTER_HOME" ]]; then rm -rf $FLUTTER_HOME/bin/cache/*; fi
   # flutter_pkg_cache:
   #   folder: $FLUTTER_HOME/bin/cache/pkg
   #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version

From 41147b069a15a6199b27a4becfcd6d4cdf5b502c Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Fri, 6 Dec 2019 18:34:59 -0800
Subject: [PATCH 35/35] FLUTTER_HOME is there, rm the cache

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

diff --git a/.cirrus.yml b/.cirrus.yml
index dbf37ac3b318..971ce1c2d91b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,7 +15,7 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
-    - if [[ -f "$FLUTTER_HOME" ]]; then rm -rf $FLUTTER_HOME/bin/cache/*; fi
+    - rm -rf $FLUTTER_HOME/bin/cache/*
   # flutter_pkg_cache:
   #   folder: $FLUTTER_HOME/bin/cache/pkg
   #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version
@@ -111,7 +111,7 @@ task:
     CHANNEL: "master" # Default to flutter master, tests can override.
   channel_script:
     - flutter channel $CHANNEL
-    - if [[ -f "$FLUTTER_HOME" ]]; then rm -rf $FLUTTER_HOME/bin/cache/*; fi
+    - rm -rf $FLUTTER_HOME/bin/cache/*
   # flutter_pkg_cache:
   #   folder: $FLUTTER_HOME/bin/cache/pkg
   #   fingerprint_script: echo $OS; cat ${FLUTTER_HOME}/bin/internal/*.version