Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 9e809b4

Browse files
authored
Merge branch 'main' into html-gradient
2 parents e1300fb + b10891e commit 9e809b4

File tree

1,222 files changed

+42552
-20811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,222 files changed

+42552
-20811
lines changed

.ci.yaml

Lines changed: 42 additions & 256 deletions
Large diffs are not rendered by default.

.github/autosubmit.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,11 @@ updates:
77
directory: "/"
88
schedule:
99
interval: "weekly"
10+
time: "22:00" # 10 PM MTV
11+
timezone: "America/Los_Angeles"
1012
labels:
1113
- "autosubmit"
14+
ignore:
15+
# ignore patch versions, just rely on minor in order to update fewer times
16+
- dependency-name: "github/codeql-action"
17+
update-types: ["version-update:semver-minor"]

.github/labeler.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# See https://github.com/actions/labeler/blob/main/README.md for docs.
6+
'affects: desktop':
7+
- shell/platform/darwin/common/**/*
8+
- shell/platform/darwin/macos/**/*
9+
- shell/platform/linux/**/*
10+
- shell/platform/windows/**/*
11+
12+
embedder:
13+
- shell/platform/embedder
14+
15+
'e: impeller':
16+
- impeller/**/*
17+
18+
platform-android:
19+
- shell/platform/android/**/*
20+
21+
platform-ios:
22+
- shell/platform/darwin/common/**/*
23+
- shell/platform/darwin/ios/**/*
24+
25+
platform-fuchsia:
26+
- shell/platform/fuchsia/**/*
27+
28+
platform-linux:
29+
- shell/platform/linux/**/*
30+
31+
platform-macos:
32+
- shell/platform/darwin/common/**/*
33+
- shell/platform/darwin/macos/**/*
34+
35+
platform-web:
36+
- lib/web_ui/**/*
37+
- '**/web_sdk/**/*'
38+
39+
platform-windows:
40+
- shell/platform/windows/**/*

.github/workflows/labeler.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
name: "Pull Request Labeler"
6+
on:
7+
- pull_request_target
8+
9+
# Declare default permissions as read only.
10+
permissions: read-all
11+
12+
jobs:
13+
triage:
14+
if: ${{ github.repository == 'flutter/engine' }}
15+
permissions:
16+
pull-requests: write
17+
runs-on: ubuntu-latest
18+
steps:
19+
# Source available at https://github.com/actions/labeler/blob/main/README.md
20+
- uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
id-token: write
2323
steps:
2424
- name: "Checkout code"
25-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
25+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
2626
with:
2727
persist-credentials: false
2828
- name: "Run analysis"
@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
52+
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a
5353
with:
5454
sarif_file: results.sarif

.github/workflows/third_party_scan.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
branch_protection_rule:
55
push:
66
branches: [ main ]
7+
pull_request:
8+
types: [ labeled ]
79

810
# Declare default permissions as read only.
911
permissions: read-all
@@ -12,7 +14,8 @@ jobs:
1214
vuln-scan:
1315
name: Vulnerability scanning
1416
runs-on: ubuntu-20.04
15-
if: ${{ github.repository == 'flutter/engine' }}
17+
# run on flutter/engine push to main or PRs with 'vulnerability patch' label
18+
if: ${{ github.repository == 'flutter/engine' && (github.event_name == 'push' || github.event.label.name == 'vulnerability scan') }}
1619
permissions:
1720
# Needed to upload the SARIF results to code-scanning dashboard.
1821
security-events: write
@@ -22,11 +25,11 @@ jobs:
2225
id-token: write
2326
steps:
2427
- name: "Checkout code"
25-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
28+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
2629
with:
2730
persist-credentials: false
2831
- name: "setup python"
29-
uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
32+
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
3033
with:
3134
python-version: '3.7.7' # install the python version needed
3235
- name: "extract and flatten deps"
@@ -42,6 +45,6 @@ jobs:
4245
retention-days: 5
4346
# Upload the results to GitHub's code scanning dashboard.
4447
- name: "Upload to security tab"
45-
uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
48+
uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a
4649
with:
4750
sarif_file: osvReport.sarif

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ Koutaro Mori <koutaro.mo@gmail.com>
2323
TheOneWithTheBraid <the-one@with-the-braid.cf>
2424
Twin Sun, LLC <google-contrib@twinsunsolutions.com>
2525
Qixing Cao <qixing.cao.83@gmail.com>
26+
LinXunFeng <linxunfeng@yeah.net>

BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ group("flutter") {
116116
public_deps += [
117117
"//flutter/display_list:display_list_benchmarks",
118118
"//flutter/display_list:display_list_builder_benchmarks",
119+
"//flutter/display_list:display_list_region_benchmarks",
119120
"//flutter/fml:fml_benchmarks",
120121
"//flutter/impeller/geometry:geometry_benchmarks",
121122
"//flutter/lib/ui:ui_benchmarks",
@@ -186,7 +187,7 @@ group("unittests") {
186187
if (is_mac) {
187188
public_deps += [
188189
"//flutter/impeller/golden_tests:impeller_golden_tests",
189-
"//flutter/shell/platform/darwin:flutter_channels_unittests",
190+
"//flutter/shell/platform/darwin/common:framework_common_unittests",
190191
"//flutter/third_party/spring_animation:spring_animation_unittests",
191192
]
192193
}

0 commit comments

Comments
 (0)