From e75f85bffd4667892f4bf897553b5719289cc220 Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:19:05 -0500
Subject: [PATCH] Run tests on either macOS 12 or 13 (#137365)

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
---
 .ci.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index d9efc9aeef..1a04d3b9f3 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -79,7 +79,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:2022_to_2023"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       device_type: none
       $flutter/osx_sdk : >-
         {
@@ -91,7 +91,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:2022_to_2023"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -106,7 +106,7 @@ platform_properties:
         ]
       device_type: none
       mac_model: "Macmini8,1"
-      os: Mac-12
+      os: Mac-12|Mac-13
       tags: >
         ["devicelab", "hostonly", "mac"]
       $flutter/osx_sdk : >-
@@ -119,7 +119,7 @@ platform_properties:
         [
           {"dependency": "apple_signing", "version": "version:2022_to_2023"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -133,7 +133,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "version:2022_to_2023"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -148,7 +148,7 @@ platform_properties:
           {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
           {"dependency": "open_jdk", "version": "version:11"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       cpu: x86
       device_type: "msm8952"
   mac_arm64_android:
@@ -158,7 +158,7 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:11"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       cpu: arm64
       device_type: "msm8952"
   mac_ios:
@@ -168,7 +168,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "version:2022_to_2023"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       cpu: x86
       device_os: iOS-16
       $flutter/osx_sdk : >-
@@ -182,7 +182,7 @@ platform_properties:
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
           {"dependency": "apple_signing", "version": "none"}
         ]
-      os: Mac-12
+      os: Mac-12|Mac-13
       cpu: arm64
       device_os: iOS-16
       $flutter/osx_sdk : >-
@@ -4415,7 +4415,7 @@ targets:
         ["devicelab", "ios", "mac"]
       task_name: flutter_gallery__transition_perf_e2e_ios
       drone_dimensions: >
-        ["device_os=iOS-16","os=Mac-12", "cpu=x86"]
+        ["device_os=iOS-16","os=Mac-12|Mac-13", "cpu=x86"]
 
   - name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
     recipe: devicelab/devicelab_drone