From ea93790479ea67c7803828a37e607b782970d7c9 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:18:18 -0500
Subject: [PATCH] Run tests on macOS 13 or 14 (#149827)

In preparation of upgrading our fleet to macOS 14, allow tests to run on either macOS 13 or 14.

Fixes https://github.com/flutter/flutter/issues/148871.
---
 .ci.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 08f5c6c768..81c7f03960 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -109,7 +109,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       device_type: none
       $flutter/osx_sdk : >-
         {
@@ -125,7 +125,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -144,7 +144,7 @@ platform_properties:
         ]
       device_type: none
       mac_model: "Macmini8,1"
-      os: Mac-13
+      os: Mac-13|Mac-14
       tags: >
         ["devicelab", "hostonly", "mac"]
       $flutter/osx_sdk : >-
@@ -161,7 +161,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -179,7 +179,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -194,7 +194,7 @@ platform_properties:
           {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
           {"dependency": "open_jdk", "version": "version:17"}
         ]
-      os: Mac-12|Mac-13
+      os: Mac-13|Mac-14
       cpu: x86
       device_type: "msm8952"
   mac_arm64_android:
@@ -204,7 +204,7 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:34v3"},
           {"dependency": "open_jdk", "version": "version:17"}
         ]
-      os: Mac-12|Mac-13
+      os: Mac-13|Mac-14
       cpu: arm64
       device_type: "msm8952"
   mac_pixel_7pro:
@@ -214,7 +214,7 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:34v3"},
           {"dependency": "open_jdk", "version": "version:17"}
         ]
-      os: Mac-12|Mac-13
+      os: Mac-13|Mac-14
       cpu: x86
       device_type: "Pixel 7 Pro"
   mac_ios:
@@ -228,7 +228,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       cpu: x86
       device_os: iOS-17
       $flutter/osx_sdk : >-
@@ -246,7 +246,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "version:to_2024"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       cpu: x86
       device_os: iOS-17
       $flutter/osx_sdk : >-
@@ -264,7 +264,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "none"}
         ]
-      os: Mac-13
+      os: Mac-13|Mac-14
       cpu: arm64
       device_os: iOS-17
       $flutter/osx_sdk : >-
@@ -4946,7 +4946,7 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: flutter_gallery__transition_perf_e2e_ios
       drone_dimensions: >
-        ["device_os=iOS-17","os=Mac-13", "cpu=x86"]
+        ["device_os=iOS-17","os=Mac-13|Mac-14", "cpu=x86"]
 
   - name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
     recipe: devicelab/devicelab_drone