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

Commit a63f2b6

Browse files
authored
Merge branch 'main' into html-gradient
2 parents 093e0b5 + 5294709 commit a63f2b6

File tree

1,821 files changed

+72841
-36239
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,821 files changed

+72841
-36239
lines changed

.ci.yaml

Lines changed: 221 additions & 98 deletions
Large diffs are not rendered by default.

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Note: Some of the checks here are used as errors selectively, see
33
# //ci/lint.sh
44
Checks: "bugprone-use-after-move,\
5+
bugprone-unchecked-optional-access,\
56
clang-analyzer-*,\
67
clang-diagnostic-*,\
78
darwin-*,\

.github/autosubmit.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Copyright 2023 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+
# This file will be added to flutter's internal repository.
6+
# https://github.com/flutter/flutter/wiki/Autosubmit-bot
7+
config_path: 'autosubmit/flutter/autosubmit_main.yml'
8+

.github/release.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- skia-flutter-autoroll
5+
- dependabot
6+
categories:
7+
- title: Impeller
8+
labels:
9+
- impeller
10+
- title: Android
11+
labels:
12+
- platform-android
13+
- title: iOS
14+
labels:
15+
- platform-ios
16+
- title: Web
17+
labels:
18+
- platform-web
19+
- title: Desktop
20+
labels:
21+
- platform-windows
22+
- platform-macos

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
- name: Mirror action step
2323
id: mirror
24-
uses: google/mirror-branch-action@c6b07e441a7ffc5ae15860c1d0a8107a3a151db8
24+
uses: google/mirror-branch-action@30c52ee21f5d3bd7fb28b95501c11aae7f17eebb
2525
with:
2626
github-token: ${{ secrets.FLUTTERMIRRORINGBOT_TOKEN }}
2727
source: 'main'

.github/workflows/scorecards-analysis.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@ on:
99
permissions: read-all
1010

1111
jobs:
12-
vuln-scan:
13-
name: Vulnerability scanning
14-
runs-on: ubuntu-20.04
15-
if: ${{ github.repository == 'flutter/engine' }}
16-
steps:
17-
- name: "Checkout code"
18-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
19-
with:
20-
persist-credentials: false
21-
- name: "setup python"
22-
uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
23-
with:
24-
python-version: '3.7.7' # install the python version needed
25-
- name: "execute py script"
26-
run: python ci/deps_parser.py
27-
2812
scorecards:
2913
name: Scorecards analysis
3014
runs-on: ubuntu-latest
@@ -38,11 +22,11 @@ jobs:
3822
id-token: write
3923
steps:
4024
- name: "Checkout code"
41-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
25+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
4226
with:
4327
persist-credentials: false
4428
- name: "Run analysis"
45-
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86
29+
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af
4630
with:
4731
results_file: results.sarif
4832
results_format: sarif
@@ -65,6 +49,6 @@ jobs:
6549

6650
# Upload the results to GitHub's code scanning dashboard.
6751
- name: "Upload to code-scanning"
68-
uses: github/codeql-action/upload-sarif@16964e90ba004cdf0cd845b866b5df21038b7723
52+
uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
6953
with:
7054
sarif_file: results.sarif
Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,47 @@
1-
name: Third party dependency scan
1+
name: Third party deps scan
22
on:
33
# Only the default branch is supported.
44
branch_protection_rule:
5+
push:
56
branches: [ main ]
6-
schedule:
7-
- cron: "0 8 * * *" # runs daily at 08:00
8-
97

108
# Declare default permissions as read only.
119
permissions: read-all
1210

1311
jobs:
14-
analysis:
15-
name: Third party dependency scan
16-
runs-on: ubuntu-latest
12+
vuln-scan:
13+
name: Vulnerability scanning
14+
runs-on: ubuntu-20.04
15+
if: ${{ github.repository == 'flutter/engine' }}
1716
permissions:
18-
# Needed to upload the results to code-scanning dashboard.
17+
# Needed to upload the SARIF results to code-scanning dashboard.
1918
security-events: write
2019
actions: read
2120
contents: read
22-
21+
# Needed to access OIDC token.
22+
id-token: write
2323
steps:
2424
- name: "Checkout code"
25-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
25+
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
2626
with:
2727
persist-credentials: false
28-
29-
- name: setup python
30-
uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
28+
- name: "setup python"
29+
uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
3130
with:
3231
python-version: '3.7.7' # install the python version needed
33-
34-
- name: install dependency
35-
run: pip install git+https://github.com/psf/requests.git@4d394574f5555a8ddcc38f707e0c9f57f55d9a3b
36-
37-
- name: execute py script
38-
run: python ci/deps_parser.py
39-
40-
- name: parse deps_parser output.txt
41-
run: python ci/scan_flattened_deps.py
42-
43-
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
44-
# format to the repository Actions tab.
32+
- name: "extract and flatten deps"
33+
run: python ci/deps_parser.py
34+
- name: "scan deps for vulnerabilities"
35+
run: python ci/scan_flattened_deps.py
36+
# Upload the results as artifacts.
4537
- name: "Upload artifact"
4638
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
4739
with:
4840
name: SARIF file
4941
path: osvReport.sarif
5042
retention-days: 5
51-
5243
# Upload the results to GitHub's code scanning dashboard.
53-
- name: "Upload to code-scanning"
54-
uses: github/codeql-action/upload-sarif@16964e90ba004cdf0cd845b866b5df21038b7723
44+
- name: "Upload to security tab"
45+
uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
5546
with:
5647
sarif_file: osvReport.sarif

.pylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ docstring-quote = double
3838
# multiple time (only on the command line, not in the configuration file where
3939
# it should appear only once).
4040
disable=
41+
duplicate-code,
4142
exec-used,
4243
fixme,
4344
missing-class-docstring,

BUILD.gn

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,16 @@ group("unittests") {
177177
}
178178

179179
if (is_mac || is_linux || is_win) {
180-
public_deps += [ "//flutter/impeller:impeller_unittests" ]
180+
public_deps += [
181+
"//flutter/impeller:impeller_dart_unittests",
182+
"//flutter/impeller:impeller_unittests",
183+
]
181184
}
182185

183186
if (is_mac) {
184-
public_deps +=
185-
[ "//flutter/shell/platform/darwin:flutter_channels_unittests" ]
186187
public_deps += [
188+
"//flutter/impeller/golden_tests:impeller_golden_tests",
189+
"//flutter/shell/platform/darwin:flutter_channels_unittests",
187190
"//flutter/third_party/spring_animation:spring_animation_unittests",
188191
]
189192
}

0 commit comments

Comments
 (0)