Skip to content

Commit

Permalink
Run tests on macOS 13 or 14 (#149827)
Browse files Browse the repository at this point in the history
In preparation of upgrading our fleet to macOS 14, allow tests to run on either macOS 13 or 14.

Fixes flutter/flutter#148871.
  • Loading branch information
vashworth authored Jun 6, 2024
1 parent 440b1c6 commit ea93790
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 : >-
{
Expand All @@ -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 : >-
Expand All @@ -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 : >-
Expand All @@ -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 : >-
Expand All @@ -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 : >-
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 : >-
Expand All @@ -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 : >-
Expand All @@ -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 : >-
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ea93790

Please sign in to comment.