From e517aa1ce26ec09f6ff2b4e75bab3408731ff2ce Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 21 Jun 2024 13:50:57 -0700 Subject: [PATCH] Run safari-dart2js-html tests on macOS 13 (flutter/engine#53497) https://github.com/flutter/engine/pull/53402 didn't work. Run these Safari tests on macOS 13 only until it can be fixed for macOS 14. --- engine/src/flutter/ci/builders/linux_web_engine.json | 12 ++++++------ .../lib/web_ui/dev/generate_builder_json.dart | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/src/flutter/ci/builders/linux_web_engine.json b/engine/src/flutter/ci/builders/linux_web_engine.json index 79548d226f..19b09660cf 100644 --- a/engine/src/flutter/ci/builders/linux_web_engine.json +++ b/engine/src/flutter/ci/builders/linux_web_engine.json @@ -1131,7 +1131,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -1164,7 +1164,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -1197,7 +1197,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -1230,7 +1230,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -1263,7 +1263,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -1296,7 +1296,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13|Mac-14", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { 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 f6252ec21d..6d9f5701a1 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 @@ -113,7 +113,7 @@ Iterable _getAllTestSteps(List suites) { suite.runConfig.browser == BrowserName.chrome || suite.runConfig.browser == BrowserName.firefox ), - ..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-13|Mac-14', cpu: 'arm64', (TestSuite suite) => + ..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-13', cpu: 'arm64', (TestSuite suite) => suite.runConfig.browser == BrowserName.safari ), ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>