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

Commit 5c83e6e

Browse files
eyebrowsoffireeyebrowsoffire
authored
Remove uses of --full-dart-sdk from the engine_v2 builders. (#39297)
Also, do not produce host-specific web_sdk artifacts in the builders.
1 parent 6678d9c commit 5c83e6e

7 files changed

+40
-183
lines changed

‎ci/builders/linux_arm_host_engine.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"gn": [
6060
"--runtime-mode",
6161
"debug",
62-
"--full-dart-sdk",
6362
"--target-os=linux",
6463
"--linux-cpu=arm64",
6564
"--prebuilt-dart-sdk"

‎ci/builders/linux_host_engine.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"out/host_debug/zip_archives/linux-x64/font-subset.zip",
7979
"out/host_debug/zip_archives/flutter_patched_sdk.zip",
8080
"out/host_debug/zip_archives/dart-sdk-linux-x64.zip",
81-
"out/host_debug/zip_archives/flutter-web-sdk-linux-x64.zip",
8281
"out/host_debug/zip_archives/linux-x64/linux-x64-flutter-gtk.zip"
8382
]
8483
}
@@ -93,7 +92,6 @@
9392
"gn": [
9493
"--runtime-mode",
9594
"debug",
96-
"--full-dart-sdk",
9795
"--prebuilt-dart-sdk",
9896
"--build-embedder-examples"
9997
],
@@ -105,7 +103,6 @@
105103
"flutter/build/archives:embedder",
106104
"flutter/build/archives:flutter_patched_sdk",
107105
"flutter/build/archives:dart_sdk_archive",
108-
"flutter/web_sdk",
109106
"flutter/tools/font-subset",
110107
"flutter/shell/platform/linux:flutter_gtk"
111108
]

‎ci/builders/mac_host_engine.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"include_paths": [
99
"out/host_debug/zip_archives/darwin-x64/artifacts.zip",
1010
"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
11-
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip",
12-
"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip"
11+
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
1312
],
1413
"name": "host_debug"
1514
}
@@ -26,7 +25,6 @@
2625
"--runtime-mode",
2726
"debug",
2827
"--no-lto",
29-
"--full-dart-sdk",
3028
"--prebuilt-dart-sdk",
3129
"--build-embedder-examples"
3230
],
@@ -37,7 +35,6 @@
3735
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
3836
"flutter/build/archives:artifacts",
3937
"flutter/build/archives:dart_sdk_archive",
40-
"flutter/web_sdk",
4138
"flutter/build/archives:archive_gen_snapshot",
4239
"flutter/build/archives:flutter_embedder_framework"
4340
]
@@ -162,7 +159,6 @@
162159
"--runtime-mode",
163160
"debug",
164161
"--no-lto",
165-
"--full-dart-sdk",
166162
"--prebuilt-dart-sdk"
167163
],
168164
"name": "mac_debug_arm64",

‎ci/builders/web_engine.json

Lines changed: 35 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,41 @@
11
{
2-
"builds": [
3-
{
4-
"archives": [],
5-
"drone_dimensions": [
6-
"device_type=none",
7-
"os=Windows-10"
8-
],
9-
"gn": [
10-
"--runtime-mode",
11-
"debug",
12-
"--unoptimized",
13-
"--full-dart-sdk",
14-
"--prebuilt-dart-sdk"
15-
],
16-
"name": "windows_host_debug",
17-
"ninja": {
18-
"config": "host_debug_unopt",
19-
"targets": []
20-
},
21-
"platform": "Windows",
22-
"tests": []
23-
},
24-
{
25-
"archives": [],
26-
"drone_dimensions": [
27-
"device_type=none",
28-
"os=Linux"
29-
],
30-
"generators": {
31-
"pub_dirs": [
32-
"flutter/lib/web_ui/",
33-
"flutter/web_sdk/web_engine_tester/"
2+
"generators": {
3+
"pub_dirs": [
4+
"flutter/lib/web_ui/",
5+
"flutter/web_sdk/web_engine_tester/"
6+
],
7+
"tasks": [
8+
{
9+
"name": "compile web_tests",
10+
"parameters": [
11+
"run",
12+
"compile_tests"
3413
],
35-
"tasks": [
36-
{
37-
"name": "compile web_tests",
38-
"parameters": [
39-
"run",
40-
"compile_tests"
41-
],
42-
"scripts": [
43-
"out/host_debug_unopt/dart-sdk/bin/dart",
44-
"flutter/lib/web_ui/dev/felt.dart"
45-
]
46-
},
47-
{
48-
"name": "check licenses",
49-
"parameters": [
50-
"check-licenses"
51-
],
52-
"scripts": [
53-
"out/host_debug_unopt/dart-sdk/bin/dart",
54-
"flutter/lib/web_ui/dev/felt.dart"
55-
]
56-
},
57-
{
58-
"name": "web engine analysis",
59-
"parameters": [],
60-
"scripts": [
61-
"flutter/lib/web_ui/dev/web_engine_analysis.sh"
62-
]
63-
}
14+
"scripts": [
15+
"out/host_debug_unopt/dart-sdk/bin/dart",
16+
"flutter/lib/web_ui/dev/felt.dart"
6417
]
6518
},
66-
"gn": [
67-
"--runtime-mode",
68-
"debug",
69-
"--unoptimized",
70-
"--full-dart-sdk"
71-
],
72-
"name": "linux_host_debug_unopt",
73-
"ninja": {
74-
"config": "host_debug_unopt",
75-
"targets": []
76-
},
77-
"platform": "Linux",
78-
"tests": []
79-
},
80-
{
81-
"archives": [],
82-
"drone_dimensions": [
83-
"device_type=none",
84-
"os=Mac"
85-
],
86-
"gn": [
87-
"--runtime-mode",
88-
"debug",
89-
"--unoptimized",
90-
"--full-dart-sdk",
91-
"--prebuilt-dart-sdk"
92-
],
93-
"name": "mac_host_debug_unopt",
94-
"ninja": {
95-
"config": "host_debug_unopt",
96-
"targets": []
19+
{
20+
"name": "check licenses",
21+
"parameters": [
22+
"check-licenses"
23+
],
24+
"scripts": [
25+
"out/host_debug_unopt/dart-sdk/bin/dart",
26+
"flutter/lib/web_ui/dev/felt.dart"
27+
]
9728
},
98-
"platform": "Mac",
99-
"tests": []
100-
}
101-
]
29+
{
30+
"name": "web engine analysis",
31+
"parameters": [
32+
"analyze"
33+
],
34+
"scripts": [
35+
"out/host_debug_unopt/dart-sdk/bin/dart",
36+
"flutter/lib/web_ui/dev/felt.dart"
37+
]
38+
}
39+
]
40+
}
10241
}

‎ci/builders/windows_arm_host_engine.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"out/host_debug_arm64/zip_archives/windows-arm64/font-subset.zip",
1212
"out/host_debug_arm64/zip_archives/dart-sdk-windows-arm64.zip",
1313
"out/host_debug_arm64/zip_archives/windows-arm64-debug/windows-arm64-flutter.zip",
14-
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip",
15-
"out/host_debug_arm64/zip_archives/flutter-web-sdk-windows-arm64.zip"
14+
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip"
1615
],
1716
"name": "host_debug_arm64"
1817
}
@@ -27,7 +26,6 @@
2726
"gn": [
2827
"--runtime-mode",
2928
"debug",
30-
"--full-dart-sdk",
3129
"--no-lto",
3230
"--windows-cpu",
3331
"arm64"
@@ -41,8 +39,7 @@
4139
"flutter/tools/font-subset",
4240
"flutter/build/archives:dart_sdk_archive",
4341
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
44-
"flutter/build/archives:windows_flutter",
45-
"flutter/web_sdk"
42+
"flutter/build/archives:windows_flutter"
4643
]
4744
},
4845
"tests": []

‎ci/builders/windows_host_engine.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"out/host_debug/zip_archives/windows-x64/font-subset.zip",
1212
"out/host_debug/zip_archives/dart-sdk-windows-x64.zip",
1313
"out/host_debug/zip_archives/windows-x64-debug/windows-x64-flutter.zip",
14-
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip",
15-
"out/host_debug/zip_archives/flutter-web-sdk-windows-x64.zip"
14+
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip"
1615
],
1716
"name": "host_debug"
1817
}
@@ -27,7 +26,6 @@
2726
"gn": [
2827
"--runtime-mode",
2928
"debug",
30-
"--full-dart-sdk",
3129
"--no-lto"
3230
],
3331
"name": "host_debug",
@@ -40,8 +38,7 @@
4038
"flutter/tools/font-subset",
4139
"flutter/build/archives:dart_sdk_archive",
4240
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
43-
"flutter/build/archives:windows_flutter",
44-
"flutter/web_sdk"
41+
"flutter/build/archives:windows_flutter"
4542
]
4643
},
4744
"tests": [

‎lib/web_ui/dev/felt_windows.bat

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

0 commit comments

Comments
 (0)