From cb40d94055c1be301da6cda2706826d15ea52b6a Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Sat, 21 Dec 2024 19:20:53 -0800 Subject: [PATCH] Remove dependency on web_tests/artifacts. (#160700) We no longer pass `web_tests/artifacts` via CAS, so we need to remove it as a dependency. --- .../flutter/ci/builders/linux_web_engine_test.json | 11 ++--------- .../flutter/lib/web_ui/dev/generate_builder_json.dart | 9 +++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/engine/src/flutter/ci/builders/linux_web_engine_test.json b/engine/src/flutter/ci/builders/linux_web_engine_test.json index 9da8e5effa..4e8e55c2ca 100644 --- a/engine/src/flutter/ci/builders/linux_web_engine_test.json +++ b/engine/src/flutter/ci/builders/linux_web_engine_test.json @@ -193,18 +193,14 @@ "parameters": [ "check-licenses" ], - "scripts": [ - "flutter/lib/web_ui/dev/felt" - ] + "script": "flutter/lib/web_ui/dev/felt" }, { "name": "web engine analysis", "parameters": [ "analyze" ], - "scripts": [ - "flutter/lib/web_ui/dev/felt" - ] + "script": "flutter/lib/web_ui/dev/felt" } ] }, @@ -220,7 +216,6 @@ "download_jdk": false }, "dependencies": [ - "web_tests/artifacts", "web_tests/test_bundles/dart2js-html-html", "web_tests/test_bundles/dart2js-html-ui", "web_tests/test_bundles/dart2js-canvaskit-engine", @@ -412,7 +407,6 @@ "download_jdk": false }, "dependencies": [ - "web_tests/artifacts", "web_tests/test_bundles/dart2js-html-html", "web_tests/test_bundles/dart2js-html-ui", "web_tests/test_bundles/dart2js-canvaskit-engine", @@ -540,7 +534,6 @@ "download_jdk": false }, "dependencies": [ - "web_tests/artifacts", "web_tests/test_bundles/dart2js-html-html", "web_tests/test_bundles/dart2js-html-ui", "web_tests/test_bundles/dart2js-canvaskit-engine", diff --git a/engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart b/engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart index daea2b41b3..d667bb36e3 100644 --- a/engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart +++ b/engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart @@ -115,12 +115,12 @@ class GenerateBuilderJsonCommand extends Command { { 'name': 'check licenses', 'parameters': ['check-licenses'], - 'scripts': ['flutter/lib/web_ui/dev/felt'], + 'script': 'flutter/lib/web_ui/dev/felt', }, { 'name': 'web engine analysis', 'parameters': ['analyze'], - 'scripts': ['flutter/lib/web_ui/dev/felt'], + 'script': 'flutter/lib/web_ui/dev/felt', }, ], }; @@ -161,10 +161,7 @@ class GenerateBuilderJsonCommand extends Command { if (cpu != null) 'cpu=$cpu', ], 'gclient_variables': {'download_android_deps': false, 'download_jdk': false}, - 'dependencies': [ - 'web_tests/artifacts', - ...bundles.map((bundle) => 'web_tests/test_bundles/${bundle.name}'), - ], + 'dependencies': [...bundles.map((bundle) => 'web_tests/test_bundles/${bundle.name}')], 'test_dependencies': [ { 'dependency': 'goldctl',