From a4bb304da36ff844df44114704e33698c65cd983 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Thu, 6 Jun 2024 10:55:49 -0500 Subject: [PATCH] Run tests on macOS 13 or 14 --- .ci.yaml | 6 ++-- ci/builders/linux_web_engine.json | 12 ++++---- ci/builders/local_engine.json | 32 ++++++++++----------- ci/builders/mac_android_aot_engine.json | 12 ++++---- ci/builders/mac_clang_tidy.json | 14 ++++----- ci/builders/mac_host_engine.json | 12 ++++---- ci/builders/mac_impeller_cmake_example.json | 2 +- ci/builders/mac_ios_engine.json | 20 ++++++------- ci/builders/mac_unopt.json | 14 ++++----- ci/builders/mac_unopt_debug_no_rbe.json | 2 +- lib/web_ui/dev/generate_builder_json.dart | 5 +--- 11 files changed, 64 insertions(+), 67 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 2f7402906230f..35a1c8b987902 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -30,7 +30,7 @@ platform_properties: {"dependency": "open_jdk", "version": "version:17"} ] device_type: none - os: Mac-13 + os: Mac-13|Mac-14 $flutter/osx_sdk : >- { "sdk_version": "15a240d" @@ -363,7 +363,7 @@ targets: "sdk_version": "15a240d" } drone_dimensions: - - os=Mac-13 + - os=Mac-13|Mac-14 - name: Linux mac_clangd recipe: engine_v2/engine_v2 @@ -392,7 +392,7 @@ targets: "sdk_version": "15a240d" } drone_dimensions: - - os=Mac-13 + - os=Mac-13|Mac-14 - cpu=x86 - name: Mac impeller-cmake-example diff --git a/ci/builders/linux_web_engine.json b/ci/builders/linux_web_engine.json index 138e42565327b..9d73ed3622188 100644 --- a/ci/builders/linux_web_engine.json +++ b/ci/builders/linux_web_engine.json @@ -1131,7 +1131,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -1164,7 +1164,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -1197,7 +1197,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -1230,7 +1230,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -1263,7 +1263,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -1296,7 +1296,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { diff --git a/ci/builders/local_engine.json b/ci/builders/local_engine.json index fa92878192aa1..97f2b3bffbc61 100644 --- a/ci/builders/local_engine.json +++ b/ci/builders/local_engine.json @@ -3,7 +3,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -35,7 +35,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -68,7 +68,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -100,7 +100,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -132,7 +132,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -165,7 +165,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -199,7 +199,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -310,7 +310,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -343,7 +343,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -427,7 +427,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -511,7 +511,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -542,7 +542,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -574,7 +574,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -606,7 +606,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -714,7 +714,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { @@ -795,7 +795,7 @@ { "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": { diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 0067f36ed5bdf..3308ae4782c97 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -14,7 +14,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -71,7 +71,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -130,7 +130,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -189,7 +189,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -246,7 +246,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -305,7 +305,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { diff --git a/ci/builders/mac_clang_tidy.json b/ci/builders/mac_clang_tidy.json index 2b9a3aaa0e085..c54bf114d3328 100644 --- a/ci/builders/mac_clang_tidy.json +++ b/ci/builders/mac_clang_tidy.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -31,7 +31,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -64,7 +64,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -114,7 +114,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -164,7 +164,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -214,7 +214,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -264,7 +264,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index f72aabce9809f..1c08026d40f13 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,7 +15,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86", "mac_model=Macmini8,1" ], @@ -100,7 +100,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86", "mac_model=Macmini8,1" ], @@ -180,7 +180,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86", "mac_model=Macmini8,1" ], @@ -268,7 +268,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -337,7 +337,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -409,7 +409,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { diff --git a/ci/builders/mac_impeller_cmake_example.json b/ci/builders/mac_impeller_cmake_example.json index 3420bab1d27eb..c43917f9ef25b 100644 --- a/ci/builders/mac_impeller_cmake_example.json +++ b/ci/builders/mac_impeller_cmake_example.json @@ -7,7 +7,7 @@ "archives": [], "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index f80ab8bef9a0a..14ec33ce169b7 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -49,7 +49,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -96,7 +96,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -140,7 +140,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -185,7 +185,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -230,7 +230,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -278,7 +278,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -327,7 +327,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -373,7 +373,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, @@ -420,7 +420,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13" + "os=Mac-13|Mac-14" ], "gclient_variables": { "download_android_deps": false, diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index f8841ade4a0b3..97188d878df6e 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86", "mac_model=Macmini8,1" ], @@ -66,7 +66,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86" ], "gclient_variables": { @@ -121,7 +121,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -183,7 +183,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -250,7 +250,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=arm64" ], "gclient_variables": { @@ -310,7 +310,7 @@ "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": @@ -350,7 +350,7 @@ "cas_archive": false, "drone_dimensions": [ - "os=Mac-13", + "os=Mac-13|Mac-14", "device_type=none" ], "gclient_variables": diff --git a/ci/builders/mac_unopt_debug_no_rbe.json b/ci/builders/mac_unopt_debug_no_rbe.json index a4bfc7e81f105..fd415737cd093 100644 --- a/ci/builders/mac_unopt_debug_no_rbe.json +++ b/ci/builders/mac_unopt_debug_no_rbe.json @@ -11,7 +11,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-13", + "os=Mac-13|Mac-14", "cpu=x86", "mac_model=Macmini8,1" ], diff --git a/lib/web_ui/dev/generate_builder_json.dart b/lib/web_ui/dev/generate_builder_json.dart index b2d9a5adc6bd5..8ff76978224bd 100644 --- a/lib/web_ui/dev/generate_builder_json.dart +++ b/lib/web_ui/dev/generate_builder_json.dart @@ -113,10 +113,7 @@ Iterable _getAllTestSteps(List suites) { suite.runConfig.browser == BrowserName.chrome || suite.runConfig.browser == BrowserName.firefox ), - // 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-13', cpu: 'arm64', (TestSuite suite) => + ..._getTestStepsForPlatform(suites, 'Mac', specificOS: 'Mac-13|Mac-14', cpu: 'arm64', (TestSuite suite) => suite.runConfig.browser == BrowserName.safari ), ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>