Run tests on either macOS 12 or 13 (#47606)
In preparation for migrating our fleet to macOS 13, we're updating tests to run on either macOS 12 or macOS 13.
I have run all tests on macOS 13: https://docs.google.com/spreadsheets/d/1-KOSOSF7uVA4KuqSMn9xz3IIJW78u8SXLYK2OAfe_Qg/edit?usp=sharing&resourcekey=0-df8Bj5PRS1IPBccPDdvRCQ
Note: I'm leaving subtests of `Linux linux_web_engine` on Mac-12 since they're currently incompatible with MacOS 13.
[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
diff --git a/.ci.yaml b/.ci.yaml
index 2c396e5..b6b83d5 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -53,7 +53,7 @@
]
device_type: none
cpu: x86
- os: Mac-12
+ os: Mac-12|Mac-13
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
@@ -452,7 +452,7 @@
"sdk_version": "14e300c"
}
drone_dimensions:
- - os=Mac-12
+ - os=Mac-12|Mac-13
- name: Linux mac_unopt
recipe: engine_v2/engine_v2
@@ -473,7 +473,7 @@
"sdk_version": "14e300c"
}
drone_dimensions:
- - os=Mac-12
+ - os=Mac-12|Mac-13
- cpu=x86
- name: Mac impeller-cmake-example
diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json
index f59354f..962250d 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-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -53,7 +53,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -93,7 +93,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -133,7 +133,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -172,7 +172,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -212,7 +212,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
diff --git a/ci/builders/mac_clang_tidy.json b/ci/builders/mac_clang_tidy.json
index f68aa40..4e3fe0c 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-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -24,7 +24,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -50,7 +50,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -82,7 +82,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -114,7 +114,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -146,7 +146,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -178,7 +178,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
diff --git a/ci/builders/mac_clang_tidy_presubmit.json b/ci/builders/mac_clang_tidy_presubmit.json
index 19f0304..50deb4c 100644
--- a/ci/builders/mac_clang_tidy_presubmit.json
+++ b/ci/builders/mac_clang_tidy_presubmit.json
@@ -3,7 +3,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -24,7 +24,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -50,7 +50,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -82,7 +82,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 83361f3..8642c1b 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-12",
+ "os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
@@ -79,7 +79,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
@@ -139,7 +139,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
@@ -208,7 +208,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -255,7 +255,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -299,7 +299,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
diff --git a/ci/builders/mac_impeller_cmake_example.json b/ci/builders/mac_impeller_cmake_example.json
index 5a9596d..291a4a2 100644
--- a/ci/builders/mac_impeller_cmake_example.json
+++ b/ci/builders/mac_impeller_cmake_example.json
@@ -5,7 +5,7 @@
"archives": [],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index 3dfc5c4..08cc3ad 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-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -26,7 +26,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -50,7 +50,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -74,7 +74,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -99,7 +99,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -124,7 +124,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -148,7 +148,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -173,7 +173,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -198,7 +198,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
@@ -224,7 +224,7 @@
{
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gn": [
diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
index 480b96a..ae72400 100644
--- a/ci/builders/mac_unopt.json
+++ b/ci/builders/mac_unopt.json
@@ -11,7 +11,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86",
"mac_model=Macmini8,1"
],
@@ -71,7 +71,7 @@
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=x86"
],
"gclient_variables": {
@@ -128,7 +128,7 @@
],
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -177,7 +177,7 @@
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
@@ -247,7 +247,7 @@
},
"drone_dimensions": [
"device_type=none",
- "os=Mac-12",
+ "os=Mac-12|Mac-13",
"cpu=arm64"
],
"gclient_variables": {
