Merge branch 'main' into issue_34688_dev

Author: camsim99

.ci.yaml

@@ -18,19 +18,12 @@ platform_properties:
       build_android_aot: "false"
       build_android_vulkan: "false"
       build_ios: "false"
-      build_windows_uwp: "false"
       build_android_jit_release: "false"
       gcs_goldens_bucket: ""
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
       no_bitcode: "false"
-      caches: >-
-        [
-          {"name":"builder_linux_engine","path":"builder"},
-          {"name":"gradle","path":"gradle"},
-          {"name":"openjdk","path":"java"}
-        ]
       # CIPD flutter_internal/java/openjdk/$platform
       dependencies: >-
         [
@@ -48,27 +41,19 @@ platform_properties:
       build_android_aot: "false"
       build_android_vulkan: "false"
       build_ios: "false"
-      build_windows_uwp: "false"
       build_android_jit_release: "false"
       gcs_goldens_bucket: ""
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
       no_bitcode: "false"
-      caches: >-
-        [
-          {"name":"flutter_cocoapods","path":"cocoapods"},
-          {"name":"osx_sdk_13a233","path":"osx_sdk"},
-          {"name":"builder_mac_engine","path":"builder"},
-          {"name":"openjdk","path":"java"}
-        ]
       # CIPD flutter_internal/java/openjdk/$platform
       dependencies: >-
         [
           {"dependency": "open_jdk", "version": "version:1.8.0u202-b08"}
         ]
       device_type: none
-      mac_model: "Macmini8,1"
+      cpu: x86
       os: Mac-12
       xcode: 13a233 # xcode 13.0
   windows:
@@ -79,18 +64,12 @@ platform_properties:
       build_android_aot: "false"
       build_android_vulkan: "false"
       build_ios: "false"
-      build_windows_uwp: "false"
       build_android_jit_release: "false"
       gcs_goldens_bucket: ""
       ios_debug: "false"
       ios_profile: "false"
       ios_release: "false"
       no_bitcode: "false"
-      caches: >-
-        [
-          {"name":"builder_win_engine","path":"builder"},
-          {"name":"openjdk","path":"java"}
-        ]
       # CIPD flutter_internal/java/openjdk/$platform
       dependencies: >-
         [
@@ -156,6 +135,8 @@ targets:
       add_recipes_cq: "true"
       build_fuchsia: "true"
       fuchsia_ctl_version: version:0.0.27
+      # ensure files from pre-production Fuchsia SDK tests are purged from cache
+      clobber: "true"
     timeout: 90
 
   - name: Linux Fuchsia FEMU
@@ -164,6 +145,8 @@ targets:
       add_recipes_cq: "true"
       build_fuchsia: "true"
       fuchsia_ctl_version: version:0.0.27
+      # ensure files from pre-production Fuchsia SDK tests are purged from cache
+      clobber: "true"
     timeout: 60
 
   - name: Linux Framework Smoke Tests
@@ -201,6 +184,14 @@ targets:
       build_host: "true"
     timeout: 90
 
+  - name: Linux linux_arm_host_engine
+    recipe: engine_v2/engine_v2
+    bringup: true
+    timeout: 60
+    properties:
+      config_name: linux_arm_host_engine
+      environment: Staging
+
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
     bringup: true
@@ -209,6 +200,14 @@ targets:
       config_name: linux_host_engine
       environment: Staging
 
+  - name: Linux linux_android_aot_engine
+    recipe: engine_v2/engine_v2
+    bringup: true
+    timeout: 60
+    properties:
+      config_name: linux_android_aot_engine
+      environment: Staging
+
   - name: Linux Web Engine
     recipe: engine/web_engine
     properties:
@@ -271,20 +270,19 @@ targets:
       jazzy_version: "0.14.1"
     timeout: 75
 
+  - name: Mac mac_host_engine
+    recipe: engine_v2/engine_v2
+    bringup: true
+    timeout: 60
+    properties:
+      config_name: mac_host_engine
+      environment: Staging
+
   - name: Mac Unopt
     recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"
       jazzy_version: "0.14.1"
-      caches: >-
-        [
-          {"name":"flutter_cocoapods","path":"cocoapods"},
-          {"name":"osx_sdk_13a233_13_15","path":"osx_sdk"},
-          {"name":"builder_mac_engine","path":"builder"},
-          {"name":"openjdk","path":"java"},
-          {"name":"xcode_runtime_ios_13_0","path":"xcode_runtime_ios_13_0"},
-          {"name":"xcode_runtime_ios_15_0","path":"xcode_runtime_ios_15_0"}
-        ]
       runtime_versions: >-
         [
           "ios-13-0",
@@ -312,13 +310,6 @@ targets:
     properties:
       add_recipes_cq: "true"
       gcs_goldens_bucket: flutter_logs
-      caches: >-
-        [
-          {"name":"flutter_cocoapods","path":"cocoapods"},
-          {"name":"old_osx_sdk","path":"osx_sdk"},
-          {"name":"builder_mac_engine","path":"builder"},
-          {"name":"openjdk","path":"java"}
-        ]
       dependencies: >-
         [
           {"dependency": "goldctl"}
@@ -400,12 +391,6 @@ targets:
       add_recipes_cq: "true"
     timeout: 75
 
-  - name: Windows UWP Engine
-    recipe: engine/engine
-    properties:
-      build_windows_uwp: "true"
-    timeout: 60
-
   - name: Windows Web Engine
     recipe: engine/web_engine
     properties:

.cirrus.yml

@@ -1,5 +1,8 @@
 gcp_credentials: ENCRYPTED[!2c88dee9c9d9805b214c9f7ad8f3bc8fae936cdb0f881d562101151c408c7e024a41222677d5831df90c60d2dd6cd80a!]
 
+# Don't run on 'master' since it's a mirror of 'main'.
+only_if: $CIRRUS_BRANCH != 'master'
+
 # LINUX
 task:
   gke_container:

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# See Dependabot documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/mirror.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - 'main'
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   mirror_job:
     permissions:

.github/workflows/scorecards-analysis.yml

@@ -21,20 +21,20 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
           persist-credentials: false
 
       - name: setup python
-        uses: actions/setup-python@0ebf233433c08fb9061af664d501c3f3ff0e9e20
+        uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
         with:
           python-version: '3.7.7' # install the python version needed
 
       - name: execute py script
         run: python ci/deps_parser.py
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@c8416b0b2bf627c349ca92fc8e3de51a64b005cf
+        uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -49,14 +49,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5
+        uses: github/codeql-action/upload-sarif@7502d6e991ca767d2db617bfd823a1ed925a0d59
         with:
           sarif_file: results.sarif

.gitignore

@@ -133,6 +133,3 @@ app.*.symbols
 
 # Prebuilt binaries.
 /prebuilts/
-
-# DEPS'd in impeller
-/impeller/

BUILD.gn

@@ -31,14 +31,6 @@ config("export_dynamic_symbols") {
   }
 }
 
-# Flutter SDK artifacts should only be built when either doing host builds, or
-# for cross-compiled desktop targets.
-# TODO: We can't build the engine artifacts for arm (32-bit) right now;
-# see https://github.com/flutter/flutter/issues/74322
-_build_engine_artifacts =
-    current_toolchain == host_toolchain ||
-    (is_linux && !is_chromeos && current_cpu != "arm") || is_mac
-
 if (flutter_prebuilt_dart_sdk) {
   copy_trees("_copy_trees") {
     sources = [
@@ -85,7 +77,7 @@ group("flutter") {
   if (!is_fuchsia) {
     public_deps += [ "//flutter/lib/snapshot:generate_snapshot_bins" ]
 
-    if (_build_engine_artifacts) {
+    if (build_engine_artifacts) {
       public_deps += [
         ":dart_sdk",
         "//flutter/flutter_frontend_server:frontend_server",
@@ -94,6 +86,10 @@ group("flutter") {
         # //flutter/lib/snapshot:generate_snapshot_bin will only build
         # gen_snapshot for the host and not the target.
         "//third_party/dart/runtime/bin:gen_snapshot",
+
+        # Impeller artifacts - compiler and libtessellator
+        "//flutter/impeller/compiler:impellerc",
+        "//flutter/impeller/tessellator:tessellator_shared",
       ]
 
       if (full_dart_sdk) {
@@ -102,7 +98,7 @@ group("flutter") {
     }
   }
 
-  if (_build_engine_artifacts) {
+  if (build_engine_artifacts) {
     public_deps += [
       "//flutter/shell/testing",
       "//flutter/tools/const_finder",
@@ -111,7 +107,7 @@ group("flutter") {
   }
 
   # Compile all benchmark targets if enabled.
-  if (enable_unittests && !is_win) {
+  if (enable_unittests && !is_win && !is_fuchsia) {
     public_deps += [
       "//flutter/display_list:display_list_benchmarks",
       "//flutter/fml:fml_benchmarks",
@@ -144,6 +140,8 @@ group("unittests") {
   # Compile all unittests targets if enabled.
   if (enable_unittests) {
     public_deps += [
+      "//flutter/display_list:display_list_rendertests",
+      "//flutter/display_list:display_list_unittests",
       "//flutter/flow:flow_unittests",
       "//flutter/fml:fml_unittests",
       "//flutter/lib/spirv/test/exception_shaders:spirv_compile_exception_shaders",
@@ -174,11 +172,13 @@ group("unittests") {
       public_deps += [ "//flutter/shell/platform/fuchsia:tests" ]
     }
 
+    if (is_mac || is_linux) {
+      public_deps += [ "//flutter/impeller:impeller_unittests" ]
+    }
+
     if (is_mac) {
-      public_deps += [
-        "//flutter/impeller:impeller_unittests",
-        "//flutter/shell/platform/darwin:flutter_channels_unittests",
-      ]
+      public_deps +=
+          [ "//flutter/shell/platform/darwin:flutter_channels_unittests" ]
     }
 
     if (!is_win && !is_fuchsia) {
@@ -237,6 +237,14 @@ group("unittests") {
   }
 }
 
+if (build_engine_artifacts) {
+  group("archives") {
+    testonly = true
+
+    deps = [ "//flutter/build/archives:artifacts" ]
+  }
+}
+
 group("dist") {
   testonly = true