Merge branch 'flutter:main' into web_custom_cursors

Author: timmaffett

.ci.yaml

@@ -54,7 +54,7 @@ platform_properties:
       device_type: none
       cpu: x86
       os: Mac-12
-      xcode: 14c18
+      xcode: 14e222b
     dimensions:
       mac_model: "Macmini8,1|Macmini9,1"
   windows:
@@ -81,6 +81,7 @@ platform_properties:
 targets:
   - name: Linux Android AOT Engine
     recipe: engine/engine
+    bringup: true
     properties:
       add_recipes_cq: "true"
       build_android_aot: "true"
@@ -90,6 +91,7 @@ targets:
 
   - name: Linux Android Debug Engine
     recipe: engine/engine
+    bringup: true
     properties:
       add_recipes_cq: "true"
       build_android_debug: "true"
@@ -108,7 +110,7 @@ targets:
       dependencies: >-
         [
           {"dependency": "android_virtual_device", "version": "31"},
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       upload_packages: "true"
       clobber: "true"
@@ -181,6 +183,7 @@ targets:
 
   - name: Linux Host Engine
     recipe: engine/engine
+    bringup: true
     properties:
       gclient_variables: >-
         {"download_emsdk": true}
@@ -190,13 +193,15 @@ targets:
     timeout: 60
 
   - name: Linux Unopt
+    bringup: true
     recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"
       clobber: "true"
     timeout: 60
 
   - name: Linux License
+    bringup: true
     recipe: engine/engine_license
     properties:
       add_recipes_cq: "true"
@@ -250,47 +255,90 @@ targets:
       build_host: "true"
     timeout: 90
 
+  - name: Linux linux_fuchsia
+    bringup: true
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      release_build: "true"
+      config_name: linux_fuchsia
+    drone_dimensions:
+      - os=Linux
+
+  - name: Linux linux_clang_tidy
+    bringup: true
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      release_build: "true"
+      config_name: linux_clang_tidy
+
   - name: Linux linux_arm_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_arm_host_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_host_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_host_desktop_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_host_desktop_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_aot_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_android_aot_engine
+    drone_dimensions:
+      - os=Linux
 
   - name: Linux linux_android_debug_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: linux_android_debug_engine
+    drone_dimensions:
+      - os=Linux
+
+  - name: Linux linux_license
+    recipe: engine_v2/builder
+    timeout: 60
+    properties:
+      config_name: linux_license
+      clobber: "true"
 
   - name: Linux linux_web_engine
     recipe: engine_v2/engine_v2
-    timeout: 60
+    timeout: 70
     properties:
       release_build: "true"
       config_name: linux_web_engine
+    drone_dimensions:
+      - os=Linux
+
+  - name: Linux linux_unopt
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      config_name: linux_unopt
 
   - name: Linux Web Framework tests
     recipe: engine/web_engine_framework
@@ -310,7 +358,7 @@ targets:
       framework: "true"
       no_goma: "true"
       drone_dimensions: >
-        ["device_type=none"]
+        ["device_type=none", "os=Linux"]
       shard: web_tests
       subshards: >-
               ["0", "1", "2", "3", "4", "5", "6", "7_last"]
@@ -341,14 +389,35 @@ targets:
         {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
-      mac_model: "Macmini8,1"
     timeout: 75
 
   - name: Linux mac_android_aot_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
+      release_build: "true"
       config_name: mac_android_aot_engine
+    drone_dimensions:
+      - os=Linux
+
+  - name: Mac mac_clang_tidy
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      config_name: mac_clang_tidy
+    runIf:
+      - DEPS
+      - .ci.yaml
+      - tools/**
+      - ci/**
+      - "**.h"
+      - "**.c"
+      - "**.cc"
+      - "**.fbs"
+      - "**.frag"
+      - "**.vert"
+      - "**.m"
+      - "**.mm"
 
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
@@ -359,10 +428,12 @@ targets:
       config_name: mac_host_engine
       dependencies: >-
         [
-          {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
+          {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
       $flutter/osx_sdk : >-
-        { "sdk_version": "14c18" }
+        { "sdk_version": "14e222b" }
+    drone_dimensions:
+      - os=Mac-12
 
   - name: Linux mac_unopt
     recipe: engine_v2/engine_v2
@@ -378,13 +449,13 @@ targets:
       add_recipes_cq: "true"
       runtime_versions: >-
         [
-          "ios-16-2_14c18",
-          "ios-16-0_14a5294e"
+          "ios-16-4_14e222b",
+          "ios-16-2_14c18"
         ]
-      mac_model: "Macmini8,1"
     timeout: 75
 
   - name: Mac Host clang-tidy
+    bringup: true
     recipe: engine/engine_lint
     properties:
       cpu: arm64
@@ -406,6 +477,7 @@ targets:
       - "**.mm"
 
   - name: Mac iOS clang-tidy
+    bringup: true
     recipe: engine/engine_lint
     properties:
       cpu: arm64
@@ -442,18 +514,19 @@ targets:
       release_build: "true"
       config_name: mac_ios_engine
       $flutter/osx_sdk : >-
-        { "sdk_version": "14c18" }
+        { "sdk_version": "14e222b" }
       dependencies: >-
         [
           {"dependency": "jazzy", "version": "0.14.1"}
         ]
+    drone_dimensions:
+      - os=Mac-12
 
   - name: Mac impeller-cmake-example
     bringup: true
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
-      release_build: "true"
       cpu: arm64
       config_name: mac_impeller_cmake_example
 
@@ -482,13 +555,17 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_android_aot_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
       release_build: "true"
       config_name: windows_host_engine
+    drone_dimensions:
+      - os=Windows
 
   - name: Windows windows_arm_host_engine
     recipe: engine_v2/engine_v2
@@ -499,8 +576,17 @@ targets:
     properties:
       release_build: "true"
       config_name: windows_arm_host_engine
+    drone_dimensions:
+      - os=Windows
+
+  - name: Windows windows_unopt
+    recipe: engine_v2/builder
+    timeout: 60
+    properties:
+      config_name: windows_unopt
 
   - name: Windows Unopt
+    bringup: true
     recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"

.github/release.yml

@@ -0,0 +1,22 @@
+changelog:
+  exclude:
+    authors:
+      - skia-flutter-autoroll
+      - dependabot
+  categories:
+    - title: Impeller
+      labels:
+        - impeller
+    - title: Android
+      labels:
+        - platform-android
+    - title: iOS
+      labels:
+        - platform-ios
+    - title: Web
+      labels:
+        - platform-web
+    - title: Desktop
+      labels:
+        - platform-windows
+        - platform-macos

.github/workflows/mirror.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Mirror action step
         id: mirror
-        uses: google/mirror-branch-action@c6b07e441a7ffc5ae15860c1d0a8107a3a151db8
+        uses: google/mirror-branch-action@30c52ee21f5d3bd7fb28b95501c11aae7f17eebb
         with:
           github-token: ${{ secrets.FLUTTERMIRRORINGBOT_TOKEN }}
           source: 'main'

.github/workflows/scorecards-analysis.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8662eabe0e9f338a07350b7fd050732745f93848
+        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
         with:
           sarif_file: results.sarif

.github/workflows/third_party_scan.yml

@@ -13,6 +13,13 @@ jobs:
     name: Vulnerability scanning
     runs-on: ubuntu-20.04
     if: ${{ github.repository == 'flutter/engine' }}
+    permissions:
+      # Needed to upload the SARIF results to code-scanning dashboard.
+      security-events: write
+      actions: read
+      contents: read
+      # Needed to access OIDC token.
+      id-token: write
     steps:
       - name: "Checkout code"
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
@@ -22,5 +29,19 @@ jobs:
         uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
         with:
           python-version: '3.7.7' # install the python version needed
-      - name: "execute py script"
+      - name: "extract and flatten deps"
         run: python ci/deps_parser.py
+      - name: "scan deps for vulnerabilities"
+        run: python ci/scan_flattened_deps.py
+      # Upload the results as artifacts.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
+        with:
+          name: SARIF file
+          path: osvReport.sarif
+          retention-days: 5
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to security tab"
+        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
+        with:
+          sarif_file: osvReport.sarif