Merge remote-tracking branch 'upstream/master'

Author: Wian-TMC

.ci/Dockerfile

@@ -31,7 +31,7 @@ RUN sudo apt-get install -y xvfb libegl1-mesa
 # Install Linux desktop build tool requirements.
 RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
 # Install necessary libraries.
-RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev
+RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
 
 # Add repo for Google Chrome and install it
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -

.ci/Dockerfile-LegacyChrome

@@ -1,48 +1,78 @@
-# Light-workload tasks.
+gcp_credentials: ENCRYPTED[ec898795b6f1b54f9cc2ab4104909f1053651f65fcab96397cfdc33dae6df5fd0fa972e29ba19f4f95125de844ab1641]
+
+# Don't run on release tags since it creates O(n^2) tasks where n is the
+# number of plugins
+only_if: $CIRRUS_TAG == ''
+env:
+  INTEGRATION_TEST_PATH: "./packages/integration_test"
+  CHANNEL: "master" # Default to master when not explicitly set by a task.
+  PLUGIN_TOOLS: "dart run ./script/tool/lib/src/main.dart"
+
+tool_setup_template: &TOOL_SETUP_TEMPLATE
+  tool_setup_script:
+    - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
+    - cd script/tool
+    - pub get
+
+flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
+  upgrade_flutter_script:
+    - flutter channel $CHANNEL
+    - flutter upgrade
+  << : *TOOL_SETUP_TEMPLATE
+
+macos_template: &MACOS_TEMPLATE
+  # Only one macOS task can run in parallel without credits, so use them for
+  # PRs on macOS.
+  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
+  osx_instance:
+    image: big-sur-xcode-12.3
+  cocoapod_install_script: sudo gem install cocoapods
+
+# Light-workload Linux tasks.
 # These use default machines, with fewer CPUs, to reduce pressure on the
 # concurrency limits.
 task:
-  # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
-  only_if: $CIRRUS_TAG == ''
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
-  container:
+  << : *FLUTTER_UPGRADE_TEMPLATE
+  gke_container:
     dockerfile: .ci/Dockerfile
-  env:
-    INTEGRATION_TEST_PATH: "./packages/integration_test"
-  upgrade_script:
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - flutter config --enable-linux-desktop
-    - git fetch origin master
+    builder_image_name: docker-builder # gce vm image
+    builder_image_project: flutter-cirrus
+    cluster_name: test-cluster
+    zone: us-central1-a
+    namespace: default
   matrix:
     ### Platform-agnostic tasks ###
     - name: plugin_tools_tests
       script:
         - cd script/tool
-        - pub get
         - CIRRUS_BUILD_ID=null pub run test
     - name: publishable
       script:
-        - flutter channel master
+        - if [[ "$CIRRUS_BRANCH" == "master" ]]; then
+        -   $PLUGIN_TOOLS version-check
+        - else
+        -   $PLUGIN_TOOLS version-check --run-on-changed-packages
+        - fi
         - ./script/check_publish.sh
     - name: format
       format_script: ./script/incremental_build.sh format --fail-on-change
+      license_script:
+        - cd script/tool
+        - pub get
+        - cd ../..
+        - dart script/tool/lib/src/main.dart license-check
     - name: test
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       test_script:
-        - flutter channel $CHANNEL
         - ./script/incremental_build.sh test
     - name: analyze_master
       env:
         matrix:
           CHANNEL: "master"
       script:
-        - flutter channel $CHANNEL
         - ./script/incremental_build.sh analyze
     ## TODO(cyanglaz):
     ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable.
@@ -51,7 +81,6 @@ task:
         matrix:
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
         - find . -depth -type d -wholename '*_web/example' -exec rm -rf {} \;
         - ./script/incremental_build.sh analyze
     ### Android tasks ###
@@ -61,7 +90,6 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh apk
     ### Web tasks ###
     - name: build_all_plugins_web
@@ -70,86 +98,41 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh web
-    - name: build-web-examples
-      env:
-        matrix:
-          CHANNEL: "master"
-      build_script:
-        - flutter channel $CHANNEL
-        - ./script/incremental_build.sh build-examples --web
-        # TODO: Add driving examples (and move to heavy-workload group).
     ### Linux desktop tasks ###
     - name: build_all_plugins_linux
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
+        - flutter config --enable-linux-desktop
         - ./script/build_all_plugins_app.sh linux
-
-# Legacy Dockerfile configuration for web integration tests.
-# https://github.com/flutter/web_installers doesn't yet support the current
-# stable version of Chrome, so newly-generated Docker images don't work.
-# TODO: Merge this task into the "Web tasks" section of the "Light-workload
-# tasks" block above once web_installers has been updated to support Chrome 89
-# (which is what the current image generated from .ci/Dockerfile has).
-task:
-  # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
-  only_if: $CIRRUS_TAG == ''
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
-  container:
-    dockerfile: .ci/Dockerfile-LegacyChrome
-  env:
-    INTEGRATION_TEST_PATH: "./packages/integration_test"
-  upgrade_script:
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - flutter config --enable-linux-desktop
-    - git fetch origin master
-  matrix:
-    - name: integration_web_smoke_test
+    - name: build-linux+drive-examples
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      # Tests integration example test in web.
-      only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''"
-      install_script:
-        - flutter channel $CHANNEL
-        - git clone https://github.com/flutter/web_installers.git
-        - cd web_installers/packages/web_drivers/
-        - pub get
-        - dart lib/web_driver_installer.dart chromedriver --install-only
-        - ./chromedriver/chromedriver --port=4444 &
+      build_script:
+        - flutter config --enable-linux-desktop
+        - ./script/incremental_build.sh build-examples --linux
       test_script:
-        - cd $INTEGRATION_TEST_PATH/example/
-        - flutter drive -v --driver=test_driver/integration_test.dart --target=integration_test/example_test.dart -d web-server --release --browser-name=chrome
+        - xvfb-run ./script/incremental_build.sh drive-examples --linux
 
-# Heavy-workload tasks.
+# Heavy-workload Linux tasks.
 # These use machines with more CPUs and memory, so will reduce parallelization
 # for non-credit runs.
 task:
-  # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
-  only_if: $CIRRUS_TAG == ''
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
-  container:
+  << : *FLUTTER_UPGRADE_TEMPLATE
+  gke_container:
     dockerfile: .ci/Dockerfile
-    cpu: 8
-    memory: 16G
-  env:
-    INTEGRATION_TEST_PATH: "./packages/integration_test"
-  upgrade_script:
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - flutter config --enable-linux-desktop
-    - git fetch origin master
+    builder_image_name: docker-builder # gce vm image
+    builder_image_project: flutter-cirrus
+    cluster_name: test-cluster
+    zone: us-central1-a
+    namespace: default
+    cpu: 4
+    memory: 12G
   matrix:
     ### Android tasks ###
     - name: build-apks+java-test+firebase-test-lab
@@ -165,7 +148,6 @@ task:
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
       script:
-        - flutter channel $CHANNEL
         # 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
@@ -186,56 +168,40 @@ task:
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
-    ### Linux desktop tasks ###
-    - name: build-linux+drive-examples
+    ### Web tasks ###
+    - name: build-web+drive-examples
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
+      install_script:
+        - git clone https://github.com/flutter/web_installers.git
+        - cd web_installers/packages/web_drivers/
+        - pub get
+        - dart lib/web_driver_installer.dart chromedriver --install-only
+        - ./chromedriver/chromedriver --port=4444 &
       build_script:
-        - flutter channel $CHANNEL
-        - ./script/incremental_build.sh build-examples --linux
-        - xvfb-run ./script/incremental_build.sh drive-examples --linux
+        - ./script/incremental_build.sh build-examples --web
+      test_script:
+        # TODO(stuartmorgan): Eliminate this check once 2.1 reaches stable.
+        - if [[ "$CHANNEL" == "master" ]]; then
+        -   ./script/incremental_build.sh drive-examples --web
+        - else
+        -   echo "Requires null-safe integration_test; skipping."
+        - fi
 
+# macOS tasks.
 task:
-  # Xcode 12 task
-  # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
-  only_if: $CIRRUS_TAG == ''
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_PR == ''
-  osx_instance:
-    image: big-sur-xcode-12.3
-  upgrade_script:
-    - sudo gem install cocoapods
-    - flutter channel stable
-    - flutter upgrade
-    - flutter channel master
-    - flutter upgrade
-    - flutter config --enable-macos-desktop
-    - git fetch origin master
-  create_simulator_script:
-    - xcrun simctl list
-    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
+  << : *MACOS_TEMPLATE
+  << : *FLUTTER_UPGRADE_TEMPLATE
   matrix:
-    ### Platform-agnostic tasks ###
-    - name: lint_darwin_plugins
-      env:
-        matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
-      script:
-        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
-        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
-        # Skip the dummy podspecs used to placate the tool.
-        - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
-        - ./script/incremental_build.sh podspecs
     ### iOS tasks ###
     - name: build_all_plugins_ipa
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh ios --no-codesign
     - name: build-ipas+drive-examples
       env:
@@ -250,9 +216,12 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
+      create_simulator_script:
+        - xcrun simctl list
+        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
       build_script:
-        - flutter channel $CHANNEL
         - ./script/incremental_build.sh build-examples --ipa
+      test_script:
         - ./script/incremental_build.sh xctest --skip $PLUGINS_TO_SKIP_XCTESTS --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
         # `drive-examples` contains integration tests, which changes the UI of the application.
         # This UI change sometimes affects `xctest`.
@@ -265,7 +234,7 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
       script:
-        - flutter channel $CHANNEL
+        - flutter config --enable-macos-desktop
         - ./script/build_all_plugins_app.sh macos
     - name: build-macos+drive-examples
       env:
@@ -274,6 +243,18 @@ task:
           CHANNEL: "stable"
         PATH: $PATH:/usr/local/bin
       build_script:
-        - flutter channel $CHANNEL
+        - flutter config --enable-macos-desktop
         - ./script/incremental_build.sh build-examples --macos --no-ipa
+      test_script:
         - ./script/incremental_build.sh drive-examples --macos
+
+task:
+  # Don't use FLUTTER_UPGRADE_TEMPLATE, Flutter tooling not needed.
+  << : *MACOS_TEMPLATE
+  << : *TOOL_SETUP_TEMPLATE
+  matrix:
+    - name: lint_darwin_plugins
+      script:
+        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
+        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
+        - ./script/incremental_build.sh podspecs