Skip to content

Commit 4ed5e1a

Browse files
authored
Migrate remaining test to macOS 26 (flutter#193825)
This PR migrates all remaining tests to Mac-26.6. Tests pinned explicitly to Mac-26.6 are to ensure goldens remain consistent. Fixes flutter#192568. Fixes flutter#193155. Fixes flutter#193157. Fixes flutter#193158. Fixes flutter#193160. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant in-code documentation (doc comments with `///`). - [x] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [flutter/website]: https://github.com/flutter/website [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent c7ca5a3 commit 4ed5e1a

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

‎.ci.yaml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ platform_properties:
254254
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
255255
{"dependency": "apple_signing", "version": "version:to_2027"}
256256
]
257-
os: Mac-15.7
257+
os: Mac-26.6 # Keep os the same as "Mac_build_test" targets' drone_dimensions
258+
cpu: arm64
258259
device_type: none
259-
cpu: x86
260260
$flutter/osx_sdk : >-
261261
{
262262
"sdk_version": "17c52"
@@ -298,7 +298,7 @@ platform_properties:
298298
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
299299
{"dependency": "apple_signing", "version": "version:to_2027"}
300300
]
301-
os: Mac-15.7
301+
os: Mac-15.7|Mac-26.6
302302
device_os: iOS-18|iOS-26
303303
$flutter/osx_sdk : >-
304304
{
@@ -316,7 +316,7 @@ platform_properties:
316316
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
317317
{"dependency": "apple_signing", "version": "version:to_2027"}
318318
]
319-
os: Mac-15.7
319+
os: Mac-15.7|Mac-26.6
320320
cpu: x86
321321
device_os: iOS-18|iOS-26
322322
$flutter/osx_sdk : >-
@@ -335,7 +335,7 @@ platform_properties:
335335
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
336336
{"dependency": "apple_signing", "version": "none"}
337337
]
338-
os: Mac-15.7
338+
os: Mac-15.7|Mac-26.6
339339
cpu: arm64
340340
device_os: iOS-18|iOS-26
341341
$flutter/osx_sdk : >-
@@ -4271,7 +4271,7 @@ targets:
42714271
recipe: flutter/flutter_drone
42724272
timeout: 60
42734273
properties:
4274-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193155
4274+
os: Mac-26.6
42754275
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
42764276
dependencies: >-
42774277
[
@@ -4300,7 +4300,7 @@ targets:
43004300
recipe: flutter/flutter_drone
43014301
timeout: 60
43024302
properties:
4303-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193157
4303+
os: Mac-26.6
43044304
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
43054305
dependencies: >-
43064306
[
@@ -4396,7 +4396,7 @@ targets:
43964396
recipe: flutter/flutter_drone
43974397
timeout: 60
43984398
properties:
4399-
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193158
4399+
os: Mac-26.6
44004400
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
44014401
dependencies: >-
44024402
[
@@ -6035,8 +6035,9 @@ targets:
60356035
tags: >
60366036
["devicelab", "ios", "mac"]
60376037
task_name: flutter_gallery__transition_perf_e2e_ios
6038+
# Keep os the same as "mac_build_test" platform_properties
60386039
drone_dimensions: >
6039-
["device_os=iOS-18|iOS-26","os=Mac-15.7", "cpu=x86"]
6040+
["device_os=iOS-18|iOS-26","os=Mac-26.6", "cpu=arm64"]
60406041
60416042
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
60426043
recipe: devicelab/devicelab_drone

‎engine/src/flutter/ci/builders/mac_unopt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
],
216216
"drone_dimensions": [
217217
"device_type=none",
218-
"os=Mac-15.7",
218+
"os=Mac-26.6",
219219
"cpu=arm64"
220220
],
221221
"gclient_variables": {

0 commit comments

Comments
 (0)