Remove all but one use of tool_runner.sh

Author: stuartmorgan-g

.cirrus.yml

@@ -6,6 +6,10 @@ only_if: $CIRRUS_TAG == ''
 env:
   CHANNEL: "master" # Default to master when not explicitly set by a task.
   PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
+  # The base command for most tool invocations, handling:
+  # - running the correct set of packages for the current branch
+  # - including any sharding that is configured for a task via $PLUGIN_SHARDING
+  TOOL_COMMAND_BASE: dart $PLUGIN_TOOL --packages-for-branch $PLUGIN_SHARDING
 
 tool_setup_template: &TOOL_SETUP_TEMPLATE
   tool_setup_script:
@@ -68,19 +72,19 @@ task:
         - cd script/tool
         - CIRRUS_BUILD_ID=null pub run test
     - name: publishable
-      version_check_script: ./script/tool_runner.sh version-check
-      publish_check_script: ./script/tool_runner.sh publish-check
+      version_check_script: $TOOL_COMMAND_BASE version-check
+      publish_check_script: $TOOL_COMMAND_BASE publish-check
     - name: format
-      format_script: ./script/tool_runner.sh format --fail-on-change
-      pubspec_script: ./script/tool_runner.sh pubspec-check
+      format_script: $TOOL_COMMAND_BASE format --fail-on-change
+      pubspec_script: $TOOL_COMMAND_BASE pubspec-check
       license_script: dart $PLUGIN_TOOL license-check
     - name: test
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       test_script:
-        - ./script/tool_runner.sh test
+        - $TOOL_COMMAND_BASE test
     - name: analyze
       env:
         matrix:
@@ -92,7 +96,7 @@ task:
       script:
         # DO NOT change the custom-analysis argument here without changing the Dart repo.
         # See the comment in script/configs/custom_analysis.yaml for details.
-        - ./script/tool_runner.sh analyze --custom-analysis=script/configs/custom_analysis.yaml
+        - $TOOL_COMMAND_BASE analyze --custom-analysis=script/configs/custom_analysis.yaml
     ### Android tasks ###
     - name: build_all_plugins_apk
       env:
@@ -126,9 +130,9 @@ task:
           CHANNEL: "stable"
       build_script:
         - flutter config --enable-linux-desktop
-        - ./script/tool_runner.sh build-examples --linux
+        - $TOOL_COMMAND_BASE build-examples --linux
       drive_script:
-        - xvfb-run ./script/tool_runner.sh drive-examples --linux
+        - xvfb-run $TOOL_COMMAND_BASE drive-examples --linux
 
 # Heavy-workload Linux tasks.
 # These use machines with more CPUs and memory, so will reduce parallelization
@@ -164,14 +168,14 @@ task:
         # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
         - export CIRRUS_CHANGE_MESSAGE=""
         - export CIRRUS_COMMIT_MESSAGE=""
-        - ./script/tool_runner.sh build-examples --apk
+        - $TOOL_COMMAND_BASE build-examples --apk
       lint_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
         # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
         - export CIRRUS_CHANGE_MESSAGE=""
         - export CIRRUS_COMMIT_MESSAGE=""
-        - ./script/tool_runner.sh lint-android # must come after build-examples
+        - $TOOL_COMMAND_BASE lint-android # must come after build-examples
       native_unit_test_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -180,7 +184,7 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         # Native integration tests are handled by firebase-test-lab below, so
         # only run unit tests.
-        - ./script/tool_runner.sh native-test --android --no-integration  # must come after apk build
+        - $TOOL_COMMAND_BASE native-test --android --no-integration  # must come after apk build
       firebase_test_lab_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -189,7 +193,7 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
         -   echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
-        -   ./script/tool_runner.sh firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml
+        -   $TOOL_COMMAND_BASE firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml
         - else
         -   echo "This user does not have permission to run Firebase Test Lab tests."
         - fi
@@ -212,9 +216,9 @@ task:
         - dart lib/web_driver_installer.dart chromedriver --install-only
         - ./chromedriver/chromedriver --port=4444 &
       build_script:
-        - ./script/tool_runner.sh build-examples --web
+        - $TOOL_COMMAND_BASE build-examples --web
       drive_script:
-        - ./script/tool_runner.sh drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
+        - $TOOL_COMMAND_BASE drive-examples --web --exclude=script/configs/exclude_integration_web.yaml
 
 # macOS tasks.
 task:
@@ -224,7 +228,7 @@ task:
     ### iOS+macOS tasks ***
     - name: lint_darwin_plugins
       script:
-        - ./script/tool_runner.sh podspecs
+        - $TOOL_COMMAND_BASE podspecs
     ### iOS tasks ###
     - name: build_all_plugins_ipa
       env:
@@ -249,16 +253,16 @@ task:
         - xcrun simctl list
         - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-5 | xargs xcrun simctl boot
       build_script:
-        - ./script/tool_runner.sh build-examples --ios
+        - $TOOL_COMMAND_BASE build-examples --ios
       xcode_analyze_script:
-        - ./script/tool_runner.sh xcode-analyze --ios
+        - $TOOL_COMMAND_BASE xcode-analyze --ios
       native_test_script:
-        - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
+        - $TOOL_COMMAND_BASE native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
       drive_script:
         # `drive-examples` contains integration tests, which changes the UI of the application.
         # This UI change sometimes affects `xctest`.
         # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
-        - ./script/tool_runner.sh drive-examples --ios --exclude=script/configs/exclude_integration_ios.yaml
+        - $TOOL_COMMAND_BASE drive-examples --ios --exclude=script/configs/exclude_integration_ios.yaml
     ### macOS desktop tasks ###
     - name: build_all_plugins_macos
       env:
@@ -277,10 +281,10 @@ task:
         PATH: $PATH:/usr/local/bin
       build_script:
         - flutter config --enable-macos-desktop
-        - ./script/tool_runner.sh build-examples --macos
+        - $TOOL_COMMAND_BASE build-examples --macos
       xcode_analyze_script:
-        - ./script/tool_runner.sh xcode-analyze --macos
+        - $TOOL_COMMAND_BASE xcode-analyze --macos
       native_test_script:
-        - ./script/tool_runner.sh native-test --macos --exclude=script/configs/exclude_native_macos.yaml
+        - $TOOL_COMMAND_BASE native-test --macos --exclude=script/configs/exclude_native_macos.yaml
       drive_script:
-        - ./script/tool_runner.sh drive-examples --macos
+        - $TOOL_COMMAND_BASE drive-examples --macos

script/configs/custom_analysis.yaml

@@ -8,9 +8,11 @@
 # from a top-level package into more specific packages in order to incrementally
 # migrate a federated plugin.
 #
-# DO NOT move or delete this file without updating
+# DO NOT move or delete this file without updating both
 # https://github.com/dart-lang/sdk/blob/master/tools/bots/flutter/analyze_flutter_plugins.sh
-# which references this file from source, but out-of-repo.
+# and
+# https://github.com/flutter/flutter/blob/master/dev/bots/test.dart
+# which reference this file from source, but out-of-repo.
 # Contact stuartmorgan or devoncarew for assistance if necessary.
 
 # TODO(ecosystem): Remove everything from this list. See: