From d2ef296ea77e33a68ea020283c92fce46daccf70 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:33:03 -0600 Subject: [PATCH] Run tests on macOS 13 exclusively (flutter/engine#49099) Release team wants engine tests running exclusively on macOS 13 in main for a while before CP'ing to beta. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style --- engine/src/flutter/.ci.yaml | 6 +++--- .../ci/builders/mac_android_aot_engine.json | 12 +++++------ .../flutter/ci/builders/mac_clang_tidy.json | 14 ++++++------- .../flutter/ci/builders/mac_host_engine.json | 12 +++++------ .../builders/mac_impeller_cmake_example.json | 2 +- .../flutter/ci/builders/mac_ios_engine.json | 20 +++++++++---------- engine/src/flutter/ci/builders/mac_unopt.json | 10 +++++----- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index 0f6e4f7893d..430257f3b86 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -31,7 +31,7 @@ platform_properties: ] device_type: none cpu: x86 - os: Mac-12|Mac-13 + os: Mac-13 $flutter/osx_sdk : >- { "sdk_version": "14e300c" @@ -368,7 +368,7 @@ targets: "sdk_version": "14e300c" } drone_dimensions: - - os=Mac-12|Mac-13 + - os=Mac-13 - name: Linux mac_unopt recipe: engine_v2/engine_v2 @@ -389,7 +389,7 @@ targets: "sdk_version": "14e300c" } drone_dimensions: - - os=Mac-12|Mac-13 + - os=Mac-13 - cpu=x86 - name: Mac impeller-cmake-example diff --git a/engine/src/flutter/ci/builders/mac_android_aot_engine.json b/engine/src/flutter/ci/builders/mac_android_aot_engine.json index 962250d0de3..a462fac1a4b 100644 --- a/engine/src/flutter/ci/builders/mac_android_aot_engine.json +++ b/engine/src/flutter/ci/builders/mac_android_aot_engine.json @@ -14,7 +14,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -53,7 +53,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -93,7 +93,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -133,7 +133,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -172,7 +172,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -212,7 +212,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { diff --git a/engine/src/flutter/ci/builders/mac_clang_tidy.json b/engine/src/flutter/ci/builders/mac_clang_tidy.json index 4e3fe0ccaad..ece0afa5fd2 100644 --- a/engine/src/flutter/ci/builders/mac_clang_tidy.json +++ b/engine/src/flutter/ci/builders/mac_clang_tidy.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -24,7 +24,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -50,7 +50,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -82,7 +82,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -114,7 +114,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -146,7 +146,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -178,7 +178,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json index 6e4aa33e6b9..592ea67224f 100644 --- a/engine/src/flutter/ci/builders/mac_host_engine.json +++ b/engine/src/flutter/ci/builders/mac_host_engine.json @@ -15,7 +15,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86", "mac_model=Macmini8,1" ], @@ -79,7 +79,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86", "mac_model=Macmini8,1" ], @@ -139,7 +139,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86", "mac_model=Macmini8,1" ], @@ -208,7 +208,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -255,7 +255,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -299,7 +299,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { diff --git a/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json b/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json index 291a4a27557..476697f2834 100644 --- a/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json +++ b/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json @@ -5,7 +5,7 @@ "archives": [], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json index 08cc3adf97d..3ecf2b60ab7 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine.json @@ -3,7 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -26,7 +26,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -50,7 +50,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -74,7 +74,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -99,7 +99,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -124,7 +124,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -148,7 +148,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -173,7 +173,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -198,7 +198,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ @@ -224,7 +224,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_unopt.json b/engine/src/flutter/ci/builders/mac_unopt.json index ae72400e34e..078b165be82 100644 --- a/engine/src/flutter/ci/builders/mac_unopt.json +++ b/engine/src/flutter/ci/builders/mac_unopt.json @@ -11,7 +11,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86", "mac_model=Macmini8,1" ], @@ -71,7 +71,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=x86" ], "gclient_variables": { @@ -128,7 +128,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -177,7 +177,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": { @@ -247,7 +247,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12|Mac-13", + "os=Mac-13", "cpu=arm64" ], "gclient_variables": {