From 37c46594b611c056768ace0685ad8453491acdfc Mon Sep 17 00:00:00 2001
From: Stuart Morgan <stuartmorgan@google.com>
Date: Thu, 11 Feb 2021 16:22:18 -0500
Subject: [PATCH 1/2] Enable CI tests on beta as well

---
 .cirrus.yml                     | 12 ++++++++++++
 script/build_all_plugins_app.sh |  8 +++-----
 script/incremental_build.sh     |  4 +++-
 script/nnbd_plugins.sh          |  2 +-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a49a8b14ca83..c7323742e6e4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,6 +11,8 @@ task:
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
@@ -33,6 +35,7 @@ task:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       test_script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -44,12 +47,14 @@ task:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script: ./script/incremental_build.sh analyze
     - name: build_all_plugins_apk
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -79,6 +84,7 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
@@ -121,6 +127,8 @@ task:
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
@@ -148,6 +156,8 @@ task:
     - sudo gem install cocoapods
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
@@ -162,6 +172,7 @@ task:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -180,6 +191,7 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       build_script:
diff --git a/script/build_all_plugins_app.sh b/script/build_all_plugins_app.sh
index 7807e6a98bce..399f1f1b79f7 100755
--- a/script/build_all_plugins_app.sh
+++ b/script/build_all_plugins_app.sh
@@ -54,13 +54,11 @@ readonly EXCLUDED_PLUGINS_LIST=(
 readonly EXCLUDED=$(IFS=, ; echo "${EXCLUDED_PLUGINS_LIST[*]}")
 
 ALL_EXCLUDED=($EXCLUDED)
-# Exclude nnbd plugins from stable.
+# Exclude nnbd plugins from stable, and conflicting plugins otherwise.
 if [ "$CHANNEL" == "stable" ]; then
   ALL_EXCLUDED=("$EXCLUDED,$EXCLUDED_PLUGINS_FROM_STABLE")
-fi
-# Exclude non-nnbd plugins from master.
-if [ "$CHANNEL" != "stable" ]; then
-  ALL_EXCLUDED=("$EXCLUDED,$EXCLUDED_PLUGINS_FROM_MASTER")
+else
+  ALL_EXCLUDED=("$EXCLUDED,$EXCLUDED_PLUGINS_FOR_NNBD")
 fi
 
 echo "Excluding the following plugins: $ALL_EXCLUDED"
diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index d98e7aac6e30..a1e3378fffde 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -41,7 +41,9 @@ BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 # otherwise it gets treated as a single argument.
 PLUGIN_SHARDING=($PLUGIN_SHARDING)
 
-if [[ "${BRANCH_NAME}" == "master" ]]; then
+#if [[ "${BRANCH_NAME}" == "master" ]]; then
+# XXX For PR testing purposes, run everything on beta too. DO NOT LAND
+if [[ "${BRANCH_NAME}" != "stable" ]]; then
   echo "Running for all packages"
   (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]})
 else
diff --git a/script/nnbd_plugins.sh b/script/nnbd_plugins.sh
index 492c8adf3ad5..a8b09a6ec5ff 100644
--- a/script/nnbd_plugins.sh
+++ b/script/nnbd_plugins.sh
@@ -47,4 +47,4 @@ readonly NON_NNBD_PLUGINS_LIST=(
 )
 
 export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}")
-export EXCLUDED_PLUGINS_FROM_MASTER=$(IFS=, ; echo "${NON_NNBD_PLUGINS_LIST[*]}")
+export EXCLUDED_PLUGINS_FOR_NNBD=$(IFS=, ; echo "${NON_NNBD_PLUGINS_LIST[*]}")

From b4a02a924f7bb7a8e9997ab90d579ba445435344 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Thu, 11 Feb 2021 14:24:42 -0800
Subject: [PATCH 2/2] Revert bot-testing change

---
 script/incremental_build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index a1e3378fffde..d98e7aac6e30 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -41,9 +41,7 @@ BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 # otherwise it gets treated as a single argument.
 PLUGIN_SHARDING=($PLUGIN_SHARDING)
 
-#if [[ "${BRANCH_NAME}" == "master" ]]; then
-# XXX For PR testing purposes, run everything on beta too. DO NOT LAND
-if [[ "${BRANCH_NAME}" != "stable" ]]; then
+if [[ "${BRANCH_NAME}" == "master" ]]; then
   echo "Running for all packages"
   (cd "$REPO_DIR" && plugin_tools "${ACTIONS[@]}" --exclude="$ALL_EXCLUDED" ${PLUGIN_SHARDING[@]})
 else