From a935aee434baf9ede8f7f74e33e45e9670eb8c0a Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Thu, 18 Oct 2018 14:56:06 -0700
Subject: [PATCH] revert incremental_build.sh

---
 script/incremental_build.sh | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/script/incremental_build.sh b/script/incremental_build.sh
index fd64856e57..283c9a550e 100755
--- a/script/incremental_build.sh
+++ b/script/incremental_build.sh
@@ -13,24 +13,17 @@ if [[ "${#ACTIONS[@]}" == 0 ]]; then
 fi
 
 BRANCH_NAME="${BRANCH_NAME:-"$(git rev-parse --abbrev-ref HEAD)"}"
-
-if [[ "${BRANCH_NAME}" != "master" ]]; then
+if [[ "${BRANCH_NAME}" == "master" ]]; then
+  echo "Running for all packages"
+  (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" $BUILD_SHARDING)
+else
   # Sets CHANGED_PACKAGES
   check_changed_packages
-fi
 
-if [[ "$CHANGED_PACKAGES" == "" ]]; then
-  echo "Running for all packages"
-  if [[ grep -q "flutter:" "${REPO_DIR}/pubspec.yaml"]]; then
+  if [[ "$CHANGED_PACKAGES" == "" ]]; then
+    echo "Running for all packages"
     (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" $BUILD_SHARDING)
-  else 
-    (cd "$REPO_DIR" && dartanalyzer . && pub get && pub run test && pub publish --dry-run)
-  fi
-else
-  echo "Running for ${CHANGED_PACKAGES}"
-  if [[ grep -q "flutter:" "${REPO_DIR}/pubspec.yaml"]]; then    
-    (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $BUILD_SHARDING)
   else
-    (cd "$REPO_DIR" && dartanalyzer . && pub get && pub run test && pub publish --dry-run)
+    (cd "$REPO_DIR" && pub global run flutter_plugin_tools "${ACTIONS[@]}" --plugins="$CHANGED_PACKAGES" $BUILD_SHARDING)
   fi
 fi