diff --git a/engine/src/flutter/ci/builders/linux_web_engine.json b/engine/src/flutter/ci/builders/linux_web_engine.json index b8e3a256120..518284ec47d 100644 --- a/engine/src/flutter/ci/builders/linux_web_engine.json +++ b/engine/src/flutter/ci/builders/linux_web_engine.json @@ -1,6 +1,6 @@ { "_comment": "THIS IS A GENERATED FILE. Do not edit this file directly.", - "_comment2": "See `generated_builder_json.dart` for the generator code", + "_comment2": "See `generate_builder_json.dart` for the generator code", "builds": [ { "name": "web_tests/artifacts", @@ -1095,7 +1095,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -1127,7 +1127,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -1159,7 +1159,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -1191,7 +1191,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -1223,7 +1223,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false 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 c4443063a6b..5e6733237fc 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 @@ -9,7 +9,7 @@ import 'felt_config.dart'; String generateBuilderJson(FeltConfig config) { final Map outputJson = { '_comment': 'THIS IS A GENERATED FILE. Do not edit this file directly.', - '_comment2': 'See `generated_builder_json.dart` for the generator code', + '_comment2': 'See `generate_builder_json.dart` for the generator code', 'builds': [ _getArtifactBuildStep(), for (final TestBundle bundle in config.testBundles) @@ -113,7 +113,10 @@ Iterable _getAllTestSteps(List suites) { suite.runConfig.browser == BrowserName.chrome || suite.runConfig.browser == BrowserName.firefox ), - ..._getTestStepsForPlatform(suites, 'Mac', (TestSuite suite) => + // TODO(jacksongardner): Stop filtering to Mac-12 after macOS 13 issues are fixed: + // https://github.com/flutter/flutter/issues/136274, + // https://github.com/flutter/flutter/issues/136279 + ..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-12', (TestSuite suite) => suite.runConfig.browser == BrowserName.safari ), ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) => @@ -129,7 +132,9 @@ Iterable _getAllTestSteps(List suites) { Iterable _getTestStepsForPlatform( List suites, String platform, - bool Function(TestSuite suite) filter) { + bool Function(TestSuite suite) filter, { + String? specificOS, +}) { return suites .where(filter) .map((TestSuite suite) => { @@ -137,7 +142,7 @@ Iterable _getTestStepsForPlatform( 'recipe': 'engine_v2/tester_engine', 'drone_dimensions': [ 'device_type=none', - 'os=$platform', + 'os=${specificOS ?? platform}', ], 'gclient_variables': { 'download_android_deps': false,