Skip to content

Commit

Permalink
Remove uses of --full-dart-sdk from the engine_v2 builders. (#39297)
Browse files Browse the repository at this point in the history
Also, do not produce host-specific web_sdk artifacts in the builders.
  • Loading branch information
eyebrowsoffire authored Jan 31, 2023
1 parent 6678d9c commit 5c83e6e
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 183 deletions.
1 change: 0 additions & 1 deletion ci/builders/linux_arm_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"gn": [
"--runtime-mode",
"debug",
"--full-dart-sdk",
"--target-os=linux",
"--linux-cpu=arm64",
"--prebuilt-dart-sdk"
Expand Down
3 changes: 0 additions & 3 deletions ci/builders/linux_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
"out/host_debug/zip_archives/linux-x64/font-subset.zip",
"out/host_debug/zip_archives/flutter_patched_sdk.zip",
"out/host_debug/zip_archives/dart-sdk-linux-x64.zip",
"out/host_debug/zip_archives/flutter-web-sdk-linux-x64.zip",
"out/host_debug/zip_archives/linux-x64/linux-x64-flutter-gtk.zip"
]
}
Expand All @@ -93,7 +92,6 @@
"gn": [
"--runtime-mode",
"debug",
"--full-dart-sdk",
"--prebuilt-dart-sdk",
"--build-embedder-examples"
],
Expand All @@ -105,7 +103,6 @@
"flutter/build/archives:embedder",
"flutter/build/archives:flutter_patched_sdk",
"flutter/build/archives:dart_sdk_archive",
"flutter/web_sdk",
"flutter/tools/font-subset",
"flutter/shell/platform/linux:flutter_gtk"
]
Expand Down
6 changes: 1 addition & 5 deletions ci/builders/mac_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"include_paths": [
"out/host_debug/zip_archives/darwin-x64/artifacts.zip",
"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip",
"out/host_debug/zip_archives/flutter-web-sdk-darwin-x64.zip"
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
],
"name": "host_debug"
}
Expand All @@ -26,7 +25,6 @@
"--runtime-mode",
"debug",
"--no-lto",
"--full-dart-sdk",
"--prebuilt-dart-sdk",
"--build-embedder-examples"
],
Expand All @@ -37,7 +35,6 @@
"flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
"flutter/build/archives:artifacts",
"flutter/build/archives:dart_sdk_archive",
"flutter/web_sdk",
"flutter/build/archives:archive_gen_snapshot",
"flutter/build/archives:flutter_embedder_framework"
]
Expand Down Expand Up @@ -162,7 +159,6 @@
"--runtime-mode",
"debug",
"--no-lto",
"--full-dart-sdk",
"--prebuilt-dart-sdk"
],
"name": "mac_debug_arm64",
Expand Down
131 changes: 35 additions & 96 deletions ci/builders/web_engine.json
Original file line number Diff line number Diff line change
@@ -1,102 +1,41 @@
{
"builds": [
{
"archives": [],
"drone_dimensions": [
"device_type=none",
"os=Windows-10"
],
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--full-dart-sdk",
"--prebuilt-dart-sdk"
],
"name": "windows_host_debug",
"ninja": {
"config": "host_debug_unopt",
"targets": []
},
"platform": "Windows",
"tests": []
},
{
"archives": [],
"drone_dimensions": [
"device_type=none",
"os=Linux"
],
"generators": {
"pub_dirs": [
"flutter/lib/web_ui/",
"flutter/web_sdk/web_engine_tester/"
"generators": {
"pub_dirs": [
"flutter/lib/web_ui/",
"flutter/web_sdk/web_engine_tester/"
],
"tasks": [
{
"name": "compile web_tests",
"parameters": [
"run",
"compile_tests"
],
"tasks": [
{
"name": "compile web_tests",
"parameters": [
"run",
"compile_tests"
],
"scripts": [
"out/host_debug_unopt/dart-sdk/bin/dart",
"flutter/lib/web_ui/dev/felt.dart"
]
},
{
"name": "check licenses",
"parameters": [
"check-licenses"
],
"scripts": [
"out/host_debug_unopt/dart-sdk/bin/dart",
"flutter/lib/web_ui/dev/felt.dart"
]
},
{
"name": "web engine analysis",
"parameters": [],
"scripts": [
"flutter/lib/web_ui/dev/web_engine_analysis.sh"
]
}
"scripts": [
"out/host_debug_unopt/dart-sdk/bin/dart",
"flutter/lib/web_ui/dev/felt.dart"
]
},
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--full-dart-sdk"
],
"name": "linux_host_debug_unopt",
"ninja": {
"config": "host_debug_unopt",
"targets": []
},
"platform": "Linux",
"tests": []
},
{
"archives": [],
"drone_dimensions": [
"device_type=none",
"os=Mac"
],
"gn": [
"--runtime-mode",
"debug",
"--unoptimized",
"--full-dart-sdk",
"--prebuilt-dart-sdk"
],
"name": "mac_host_debug_unopt",
"ninja": {
"config": "host_debug_unopt",
"targets": []
{
"name": "check licenses",
"parameters": [
"check-licenses"
],
"scripts": [
"out/host_debug_unopt/dart-sdk/bin/dart",
"flutter/lib/web_ui/dev/felt.dart"
]
},
"platform": "Mac",
"tests": []
}
]
{
"name": "web engine analysis",
"parameters": [
"analyze"
],
"scripts": [
"out/host_debug_unopt/dart-sdk/bin/dart",
"flutter/lib/web_ui/dev/felt.dart"
]
}
]
}
}
7 changes: 2 additions & 5 deletions ci/builders/windows_arm_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"out/host_debug_arm64/zip_archives/windows-arm64/font-subset.zip",
"out/host_debug_arm64/zip_archives/dart-sdk-windows-arm64.zip",
"out/host_debug_arm64/zip_archives/windows-arm64-debug/windows-arm64-flutter.zip",
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip",
"out/host_debug_arm64/zip_archives/flutter-web-sdk-windows-arm64.zip"
"out/host_debug_arm64/zip_archives/windows-arm64/flutter-cpp-client-wrapper.zip"
],
"name": "host_debug_arm64"
}
Expand All @@ -27,7 +26,6 @@
"gn": [
"--runtime-mode",
"debug",
"--full-dart-sdk",
"--no-lto",
"--windows-cpu",
"arm64"
Expand All @@ -41,8 +39,7 @@
"flutter/tools/font-subset",
"flutter/build/archives:dart_sdk_archive",
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
"flutter/build/archives:windows_flutter",
"flutter/web_sdk"
"flutter/build/archives:windows_flutter"
]
},
"tests": []
Expand Down
7 changes: 2 additions & 5 deletions ci/builders/windows_host_engine.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"out/host_debug/zip_archives/windows-x64/font-subset.zip",
"out/host_debug/zip_archives/dart-sdk-windows-x64.zip",
"out/host_debug/zip_archives/windows-x64-debug/windows-x64-flutter.zip",
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip",
"out/host_debug/zip_archives/flutter-web-sdk-windows-x64.zip"
"out/host_debug/zip_archives/windows-x64/flutter-cpp-client-wrapper.zip"
],
"name": "host_debug"
}
Expand All @@ -27,7 +26,6 @@
"gn": [
"--runtime-mode",
"debug",
"--full-dart-sdk",
"--no-lto"
],
"name": "host_debug",
Expand All @@ -40,8 +38,7 @@
"flutter/tools/font-subset",
"flutter/build/archives:dart_sdk_archive",
"flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
"flutter/build/archives:windows_flutter",
"flutter/web_sdk"
"flutter/build/archives:windows_flutter"
]
},
"tests": [
Expand Down
68 changes: 0 additions & 68 deletions lib/web_ui/dev/felt_windows.bat

This file was deleted.

0 comments on commit 5c83e6e

Please sign in to comment.