From 45cec6aaa9598f47cf9df79a8bb1f9d0b0822c56 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Jul 2019 08:59:21 -0700
Subject: [PATCH 1/5] Cirrus should report errors on failures of
 incremental_build.sh

---
 packages/local_auth/CHANGELOG.md | 2 ++
 script/incremental_build.sh      | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index fbbd49351d62..0eef147b3720 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,3 +1,5 @@
+(test change: revert me)
+
 ## 0.5.2+4
 
 * Update README to fix syntax error.
diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index adb0acc72b97..b8b7dee4ae45 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -3,6 +3,7 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 REPO_DIR="$(dirname "$SCRIPT_DIR")"
+pushd $REPO_DIR
 
 source "$SCRIPT_DIR/common.sh"
 
@@ -15,7 +16,7 @@ fi
 BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 if [[ "${BRANCH_NAME}" == "master" ]]; then
   echo "Running for all packages"
-  (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING)
+  pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING
 else
   # Sets CHANGED_PACKAGES
   check_changed_packages
@@ -23,8 +24,10 @@ else
   if [[ "$CHANGED_PACKAGES" == "" ]]; then
     echo "No changes detected in packages."
   else
-    (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING)
+    pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING
     echo "Running version check for changed packages"
-    (cd "$REPO_DIR" && pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)")
+    pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)"
   fi
 fi
+
+popd

From 8de9fa0434b9eeb41a599eb0e1ec5cd8c8d2fc2b Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Jul 2019 09:11:13 -0700
Subject: [PATCH 2/5] Simpler solution

---
 script/incremental_build.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index b8b7dee4ae45..bd0551057a32 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -3,7 +3,6 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 REPO_DIR="$(dirname "$SCRIPT_DIR")"
-pushd $REPO_DIR
 
 source "$SCRIPT_DIR/common.sh"
 
@@ -16,7 +15,7 @@ fi
 BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 if [[ "${BRANCH_NAME}" == "master" ]]; then
   echo "Running for all packages"
-  pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING
+  (cd "$REPO_DIR"; pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING)
 else
   # Sets CHANGED_PACKAGES
   check_changed_packages
@@ -24,10 +23,8 @@ else
   if [[ "$CHANGED_PACKAGES" == "" ]]; then
     echo "No changes detected in packages."
   else
-    pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING
+    (cd "$REPO_DIR"; pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING)
     echo "Running version check for changed packages"
-    pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)"
+    (cd "$REPO_DIR"; pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)")
   fi
 fi
-
-popd

From 6c16047b977b1f8df9a98985df6d2f4f97403a56 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Jul 2019 09:27:55 -0700
Subject: [PATCH 3/5] Fix that actually works

---
 script/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/common.sh b/script/common.sh
index 4b801988480c..c3183fac2432 100644
--- a/script/common.sh
+++ b/script/common.sh
@@ -14,7 +14,7 @@ function check_changed_packages() {
   # We need this check because some CIs can do a single branch clones with a limited history of commits.
   local packages
   local branch_base_sha="$(get_branch_base_sha)"
-  if [[ "$?" == 0 ]]; then
+  if [[ "$branch_base_sha" != "" ]]; then
     echo "Checking for changed packages from $branch_base_sha"
     IFS=$'\n' packages=( $(git diff --name-only "$branch_base_sha" HEAD | grep -o "packages/[^/]*" | sed -e "s/packages\///g" | sort | uniq) )
   else

From 4d955e9cc2cf8b538e77b3611ab2045b65fb1ab8 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Jul 2019 09:32:23 -0700
Subject: [PATCH 4/5] Revert unnecessary changes

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

diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index bd0551057a32..adb0acc72b97 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -15,7 +15,7 @@ fi
 BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
 if [[ "${BRANCH_NAME}" == "master" ]]; then
   echo "Running for all packages"
-  (cd "$REPO_DIR"; pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING)
+  (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" $PLUGIN_SHARDING)
 else
   # Sets CHANGED_PACKAGES
   check_changed_packages
@@ -23,8 +23,8 @@ else
   if [[ "$CHANGED_PACKAGES" == "" ]]; then
     echo "No changes detected in packages."
   else
-    (cd "$REPO_DIR"; pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING)
+    (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $PLUGIN_SHARDING)
     echo "Running version check for changed packages"
-    (cd "$REPO_DIR"; pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)")
+    (cd "$REPO_DIR" && pub global run flutter_plugin_tools version-check --base_sha="$(get_branch_base_sha)")
   fi
 fi

From a74448ce9fea9cd58abfaa632d57e1c3a6275ad9 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Wed, 17 Jul 2019 09:34:00 -0700
Subject: [PATCH 5/5] Revert local_auth/CHANGELOG.md

---
 packages/local_auth/CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md
index 0eef147b3720..fbbd49351d62 100644
--- a/packages/local_auth/CHANGELOG.md
+++ b/packages/local_auth/CHANGELOG.md
@@ -1,5 +1,3 @@
-(test change: revert me)
-
 ## 0.5.2+4
 
 * Update README to fix syntax error.