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

Commit 8f828bf

Browse files
Merge remote-tracking branch 'upstream/master' into autofill-ios
2 parents 053b17e + f56e678 commit 8f828bf

File tree

606 files changed

+18490
-5507
lines changed

Some content is hidden

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

606 files changed

+18490
-5507
lines changed

.cirrus.yml

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
22

33
web_shard_template: &WEB_SHARD_TEMPLATE
4-
only_if: "changesInclude('.cirrus.yml', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
4+
only_if: "changesInclude('.cirrus.yml', 'DEPS', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
55
environment:
6-
# As of October 2019, the Web shards needed more than 6G of RAM.
7-
CPU: 2
8-
MEMORY: 8G
6+
# As of March 2020, the Web shards needed 16G of RAM and 4 CPUs to run all framework tests with goldens without flaking.
7+
CPU: 4
8+
MEMORY: 16G
99
compile_host_script: |
1010
cd $ENGINE_PATH/src
1111
./flutter/tools/gn --unoptimized --full-dart-sdk
1212
ninja -C out/host_debug_unopt
1313
fetch_framework_script: |
14-
mkdir -p $FRAMEWORK_PATH
15-
cd $FRAMEWORK_PATH
16-
git clone https://github.com/flutter/flutter.git
17-
cd flutter
14+
cd $ENGINE_PATH/src/flutter/tools
15+
./clone_flutter.sh
16+
cd $FRAMEWORK_PATH/flutter
1817
bin/flutter update-packages --local-engine=host_debug_unopt
1918
script:
2019
- dart --enable-asserts $FRAMEWORK_PATH/flutter/dev/bots/test.dart --local-engine=host_debug_unopt
@@ -60,9 +59,21 @@ task:
6059
benchmark_host_script: |
6160
cd $ENGINE_PATH/src/out/host_release/
6261
./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
62+
./fml_benchmarks --benchmark_format=json > fml_benchmarks.json
63+
./fml_benchmarks --benchmark_format=json > shell_benchmarks.json
6364
cd $ENGINE_PATH/src/flutter/testing/benchmark
6465
pub get
6566
dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
67+
dart bin/parse_and_send.dart ../../../out/host_release/fml_benchmarks.json
68+
dart bin/parse_and_send.dart ../../../out/host_release/shell_benchmarks.json
69+
- name: build_and_test_linux_release
70+
compile_host_script: |
71+
cd $ENGINE_PATH/src
72+
./flutter/tools/gn --runtime-mode=release
73+
ninja -C out/host_release
74+
test_host_script: |
75+
cd $ENGINE_PATH/src
76+
./flutter/testing/run_tests.sh host_release
6677
- name: build_and_test_linux_unopt_debug
6778
compile_host_script: |
6879
cd $ENGINE_PATH/src
@@ -125,6 +136,39 @@ task:
125136
- name: web_tests-7_last-linux # last Web shard must end with _last
126137
<< : *WEB_SHARD_TEMPLATE
127138

139+
- name: web_engine_analysis
140+
compile_host_script: |
141+
cd $ENGINE_PATH/src
142+
./flutter/tools/gn --unoptimized --full-dart-sdk
143+
ninja -C out/host_debug_unopt
144+
script:
145+
- cd $ENGINE_PATH/src/flutter/lib/web_ui
146+
- $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
147+
- $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dartanalyzer --fatal-warnings --fatal-hints dev/ lib/ test/ tool/
148+
149+
- name: web_engine_integration_test_linux
150+
compile_host_script: |
151+
cd $ENGINE_PATH/src
152+
./flutter/tools/gn --unoptimized --full-dart-sdk
153+
ninja -C out/host_debug_unopt
154+
fetch_framework_script: |
155+
cd $ENGINE_PATH/src/flutter/tools
156+
./clone_flutter.sh
157+
cd $FRAMEWORK_PATH/flutter
158+
bin/flutter update-packages --local-engine=host_debug_unopt
159+
script:
160+
- git clone https://github.com/flutter/web_installers.git
161+
- cd web_installers/packages/web_drivers/
162+
- $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/pub get
163+
- $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/dart lib/web_driver_installer.dart chromedriver --install-only
164+
- ./chromedriver/chromedriver --port=4444 &
165+
- cd $ENGINE_PATH/src/flutter/e2etests/web/regular_integration_tests
166+
- $FRAMEWORK_PATH/flutter/bin/flutter config --local-engine=host_debug_unopt --no-analytics --enable-web
167+
- $FRAMEWORK_PATH/flutter/bin/flutter pub get --local-engine=host_debug_unopt
168+
- $FRAMEWORK_PATH/flutter/bin/flutter drive -v --target=test_driver/text_editing_e2e.dart -d web-server --release --browser-name=chrome --local-engine=host_debug_unopt
169+
- $FRAMEWORK_PATH/flutter/bin/flutter drive -v --target=test_driver/treeshaking_e2e.dart -d web-server --profile --browser-name=chrome --local-engine=host_debug_unopt
170+
- $FRAMEWORK_PATH/flutter/bin/flutter drive -v --target=test_driver/image_loading_e2e.dart -d web-server --release --browser-name=chrome --local-engine=host_debug_unopt
171+
128172
- name: build_and_test_web_linux_firefox
129173
compile_host_script: |
130174
cd $ENGINE_PATH/src

.github/auto_assign.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ reviewers:
2020
- franciscojma86
2121
- cbracken
2222
- flar
23-
- stuartmorgan
2423

2524
# A number of reviewers added to the pull request
2625
# Set 0 to add all the reviewers (default: 0)

.gitignore

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,102 @@ xcuserdata
2929

3030
third_party/gn/
3131

32+
# Miscellaneous
33+
*.class
34+
*.lock
35+
*.log
36+
*.pyc
37+
*.swp
38+
.DS_Store
39+
.atom/
40+
.buildlog/
41+
.history
42+
.svn/
43+
44+
# IntelliJ related
45+
*.iml
46+
*.ipr
47+
*.iws
48+
.idea/
49+
50+
# Visual Studio Code related
51+
.classpath
52+
.project
53+
.settings/
54+
.vscode/
55+
56+
# packages file containing multi-root paths
57+
.packages.generated
58+
59+
# Flutter/Dart/Pub related
60+
**/doc/api/
61+
.dart_tool/
62+
.flutter-plugins
63+
.flutter-plugins-dependencies
64+
.packages
65+
.pub-cache/
66+
.pub/
67+
build/
68+
flutter_*.png
69+
linked_*.ds
70+
unlinked.ds
71+
unlinked_spec.ds
72+
73+
# Android related
74+
**/android/**/gradle-wrapper.jar
75+
**/android/.gradle
76+
**/android/captures/
77+
**/android/gradlew
78+
**/android/gradlew.bat
79+
**/android/local.properties
80+
**/android/**/GeneratedPluginRegistrant.java
81+
**/android/key.properties
82+
*.jks
83+
84+
# iOS/XCode related
85+
**/ios/**/*.mode1v3
86+
**/ios/**/*.mode2v3
87+
**/ios/**/*.moved-aside
88+
**/ios/**/*.pbxuser
89+
**/ios/**/*.perspectivev3
90+
**/ios/**/*sync/
91+
**/ios/**/.sconsign.dblite
92+
**/ios/**/.tags*
93+
**/ios/**/.vagrant/
94+
**/ios/**/DerivedData/
95+
**/ios/**/Icon?
96+
**/ios/**/Pods/
97+
**/ios/**/.symlinks/
98+
**/ios/**/profile
99+
**/ios/**/xcuserdata
100+
**/ios/.generated/
101+
**/ios/Flutter/App.framework
102+
**/ios/Flutter/Flutter.framework
103+
**/ios/Flutter/Flutter.podspec
104+
**/ios/Flutter/Generated.xcconfig
105+
**/ios/Flutter/app.flx
106+
**/ios/Flutter/app.zip
107+
**/ios/Flutter/flutter_assets/
108+
**/ios/Flutter/flutter_export_environment.sh
109+
**/ios/ServiceDefinitions.json
110+
**/ios/Runner/GeneratedPluginRegistrant.*
111+
112+
# macOS
113+
**/macos/Flutter/GeneratedPluginRegistrant.swift
114+
**/macos/Flutter/Flutter-Debug.xcconfig
115+
**/macos/Flutter/Flutter-Release.xcconfig
116+
**/macos/Flutter/Flutter-Profile.xcconfig
117+
118+
# Coverage
119+
coverage/
120+
121+
# Symbols
122+
app.*.symbols
123+
124+
# Exceptions to above rules.
125+
!**/ios/**/default.mode1v3
126+
!**/ios/**/default.mode2v3
127+
!**/ios/**/default.pbxuser
128+
!**/ios/**/default.perspectivev3
129+
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
130+
!/dev/ci/**/Gemfile.lock

BUILD.gn

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ group("flutter") {
1919

2020
public_deps = []
2121

22-
if (!(is_fuchsia && using_fuchsia_sdk)) {
22+
if (!is_fuchsia) {
2323
public_deps += [
2424
"//flutter/lib/snapshot:generate_snapshot_bin",
2525
"//flutter/lib/snapshot:kernel_platform_files",
@@ -40,14 +40,14 @@ group("flutter") {
4040
public_deps += [ "//flutter/tools/const_finder" ]
4141
}
4242

43-
if (is_fuchsia && using_fuchsia_sdk) {
43+
if (is_fuchsia) {
4444
public_deps += [
4545
"//flutter/shell/platform/fuchsia",
4646
"//flutter/shell/testing($host_toolchain)",
4747
]
4848
}
4949

50-
if (!is_fuchsia && !is_fuchsia_host) {
50+
if (!is_fuchsia) {
5151
if (current_toolchain == host_toolchain) {
5252
public_deps += [
5353
"//flutter/flutter_frontend_server:frontend_server",
@@ -75,6 +75,7 @@ group("flutter") {
7575
"//flutter/lib/ui:ui_unittests",
7676
"//flutter/runtime:runtime_unittests",
7777
"//flutter/shell/common:shell_unittests",
78+
"//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
7879
"//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
7980
"//flutter/shell/platform/embedder:embedder_unittests",
8081
"//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests",

0 commit comments

Comments
 (0)