feature/peg-4339-fetch-and-merge-all-the-upstream-commits

.ci.yaml

@@ -4,32 +4,24 @@
 # for every commit.
 #
 # More information at:
-#  * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
+#  * https://github.com/flutter/cocoon/blob/main/CI_YAML.md
 enabled_branches:
-  - master
+  - main
 
 platform_properties:
   linux:
     properties:
-      caches: >-
-        [
-        ]
       dependencies: >
         [
-          {"dependency": "curl"}
+          {"dependency": "curl", "version": "version:7.64.0"}
         ]
       device_type: none
       os: Linux
   windows:
     properties:
-      caches: >-
-        [
-          {"name": "vsbuild", "path": "vsbuild"},
-          {"name": "pub_cache", "path": ".pub-cache"}
-        ]
       dependencies: >
         [
-          {"dependency": "certs"}
+          {"dependency": "certs", "version": "version:9563bb"}
         ]
       device_type: none
       os: Windows
@@ -41,11 +33,12 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
-    scheduler: luci
 
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
@@ -56,21 +49,21 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
-    scheduler: luci
 
   - name: Windows windows-build_all_plugins master
     recipe: plugins/plugins
     timeout: 30
     properties:
       add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
-    scheduler: luci
 
   - name: Windows windows-build_all_plugins stable
     recipe: plugins/plugins
@@ -81,33 +74,20 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
-
-  - name: Windows uwp-platform_tests master
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: uwp_build_and_platform_tests.yaml
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
-    scheduler: luci
 
   - name: Windows plugin_tools_tests
     recipe: plugins/plugins
     timeout: 30
     properties:
       add_recipes_cq: "true"
       target_file: plugin_tools_tests.yaml
-    scheduler: luci
+      channel: master
+      version_file: flutter_master.version
 
   - name: Linux ci_yaml plugins roller
     recipe: infra/ci_yaml
     timeout: 30
-    scheduler: luci
     runIf:
       - .ci.yaml

.ci/Dockerfile

@@ -1,14 +1,10 @@
 # The Flutter version is not important here, since the CI scripts update Flutter
 # before running. What matters is that the base image is pinned to minimize
 # unintended changes when modifying this file.
-FROM cirrusci/flutter:2.2.2
+FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f
 
 RUN apt-get update -y
 
-# Required by Roboeletric and the Android SDK.
-RUN apt-get install -y openjdk-8-jdk
-ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-
 RUN apt-get install -y --no-install-recommends gnupg
 
 # Add repo for gcloud sdk and install it
@@ -45,6 +41,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo ap
 RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
 
-# Make Chrome the default so http: has a handler for url_launcher tests.
+# Make Chrome the default so http: and file: has a handler for url_launcher tests.
 RUN apt-get install -y xdg-utils
 RUN xdg-settings set default-web-browser google-chrome.desktop
+RUN xdg-mime default google-chrome.desktop inode/directory

.ci/flutter_master.version

@@ -0,0 +1 @@
+5a5d021e51ca9a16fdfc64b34a8d64c75be1b500

.ci/scripts/build_examples_win32.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
-   --packages-for-branch
+   --packages-for-branch --log-timing

.ci/scripts/drive_examples_win32.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
-   --packages-for-branch
+   --exclude=script/configs/exclude_integration_win32.yaml --packages-for-branch --log-timing

.ci/scripts/native_test_win32.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
-   --no-integration --packages-for-branch
+   --no-integration --packages-for-branch --log-timing

.ci/scripts/prepare_tool.sh

@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 # To set FETCH_HEAD for "git merge-base" to work
-git fetch origin master
+git fetch origin main
 
 cd script/tool
 dart pub get