Merge remote-tracking branch 'upstream/main' into 2-multi-win-popups

flutter · Dec 10, 2024 · f543082 · f543082
2 parents 85c34ed + 4d00124
commit f543082
Show file tree

Hide file tree

Showing 1,135 changed files with 87,179 additions and 54,963 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -52,6 +52,8 @@ targets:
     recipe: engine_v2/engine_v2
     properties:
       config_name: local_engine
+    # local_engine schedules a bunch of other builds, so it's likely to timeout waiting for those builds to run.
+    timeout: 180
 
   - name: Linux linux_android_emulator_tests
     bringup: true
@@ -231,7 +233,7 @@ targets:
 
   - name: Linux linux_fuchsia
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 120
     properties:
       release_build: "true"
       config_name: linux_fuchsia
@@ -406,7 +408,7 @@ targets:
   - name: Linux clangd
     recipe: engine_v2/builder
     properties:
-      config_name: linux_unopt_debug_no_rbe
+      config_name: linux_clangd
 
   - name: Linux linux_unopt
     recipe: engine_v2/engine_v2
@@ -434,7 +436,7 @@ targets:
       shard: web_tests
       subshards: >-
               ["0", "1", "2", "3", "4", "5", "6", "7_last"]
-    timeout: 60
+    timeout: 120
     runIf:
       - DEPS
       - .ci.yaml
@@ -503,22 +505,19 @@ targets:
     drone_dimensions:
       - os=Mac-13|Mac-14
 
-  # Avoid using a Mac orchestrator to save ~5 minutes of Mac host time.
-  - name: Linux mac_clangd
-    recipe: engine_v2/engine_v2
-    timeout: 90
-    # Do not remove(https://github.com/flutter/flutter/issues/144644)
-    # Scheduler will fail to get the platform
-    drone_dimensions:
-      - os=Linux
+  - name: Mac clangd
+    recipe: engine_v2/builder
     properties:
-      config_name: mac_unopt_debug_no_rbe
+      config_name: mac_clangd
+      cpu: arm64
 
   - name: Mac mac_unopt
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt
       add_recipes_cq: "true"
+      # Retry for flakes caused by https://github.com/flutter/flutter/issues/157636
+      presubmit_max_attempts: "2"
     timeout: 120
 
   - name: Mac mac_ios_engine

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,13 +18,13 @@
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
-[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
-[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
+[Contributor Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview
+[Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
+[test-exempt]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests
+[Flutter Style Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
-[testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
+[testing the engine]: https://github.com/flutter/engine/blob/main/docs/testing/Testing-the-engine.md
 [CLA]: https://cla.developers.google.com/
 [flutter/tests]: https://github.com/flutter/tests
-[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
-[Discord]: https://github.com/flutter/flutter/wiki/Chat
+[breaking change policy]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#handling-breaking-changes
+[Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,10 +11,14 @@ updates:
       timezone: "America/Los_Angeles"
     labels:
       - "autosubmit"
+    groups:
+      all-github-actions:
+        patterns: [ "*" ]
     ignore:
       # ignore patch versions, just rely on minor in order to update fewer times
       - dependency-name: "github/codeql-action"
         update-types: ["version-update:semver-minor"]
+
   - package-ecosystem: "pub"
     directory: "/lib/web_ui"
     schedule:

diff --git a/.github/workflows/engine-cp.yml b/.github/workflows/engine-cp.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.merge_commit_sha }})" >> $GITHUB_ENV
       - name: Checkout Flutter Engine Repo
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: flutteractionsbot/engine
           path: engine

diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml
@@ -21,17 +21,17 @@ jobs:
       contents: read
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           persist-credentials: false
       - name: "setup python"
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
         with:
           python-version: '3.7.7' # install the python version needed
       - name: "extract deps, find commit hash, pass to osv-scanner"
         run: python ci/scan_deps.py --output osv-lockfile-${{github.sha}}.json
       - name: "upload osv-scanner deps"
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9
+        uses: actions/upload-artifact@v4
         with:
           # use github.ref in name to avoid duplicated artifacts
           name: osv-lockfile-${{github.sha}}

diff --git a/BUILD.gn b/BUILD.gn
@@ -183,10 +183,10 @@ group("unittests") {
   # Compile all unittests targets if enabled.
   if (enable_unittests) {
     public_deps += [
+      "//flutter/assets:assets_unittests",
       "//flutter/display_list:display_list_rendertests",
       "//flutter/display_list:display_list_unittests",
       "//flutter/flow:flow_unittests",
-      "//flutter/fml:fml_arc_unittests",
       "//flutter/fml:fml_unittests",
       "//flutter/lib/ui:ui_unittests",
       "//flutter/runtime:dart_plugin_registrant_unittests",
@@ -196,6 +196,7 @@ group("unittests") {
       "//flutter/shell/platform/embedder:embedder_a11y_unittests",
       "//flutter/shell/platform/embedder:embedder_proctable_unittests",
       "//flutter/shell/platform/embedder:embedder_unittests",
+      "//flutter/testing:testing_unittests",
       "//flutter/testing/dart",
       "//flutter/testing/smoke_test_failure",
       "//flutter/third_party/tonic/tests:tonic_unittests",

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -243,6 +243,7 @@ $ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine
 | Name                                     | run_tests.py type   | Description                                                     |
 | ---------------------------------------- | ------------------- | --------------------------------------------------------------- |
 | accessibility_unittests                  | engine              |                                                                 |
+| assets_unittests                         | engine              |                                                                 |
 | client_wrapper_glfw_unittests            | engine              |                                                                 |
 | client_wrapper_unittests                 | engine              |                                                                 |
 | common_cpp_core_unittests                | engine              |                                                                 |
@@ -256,7 +257,6 @@ $ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine
 | felt                                     | n/a                 | The test runner for flutter web. See //lib/web_ui               |
 | flow_unittests                           | engine              |                                                                 |
 | flutter_tester                           | dart                | Launcher for engine dart tests.                                 |
-| fml_arc_unittests                        | engine              |                                                                 |
 | fml_unittests                            | engine              | Unit tests for //fml                                            |
 | framework_common_unittests               | engine(mac)         |                                                                 |
 | gpu_surface_metal_unittests              | engine(mac)         |                                                                 |