Skip to content

Commit de9436d

Browse files
okorohelijahokorohelijah
authored
Run all flutter/flutter macOS tests using Xcode 26 and iOS 26 simulator (#185431)
Updates Xcode SDK version from 16c5032a to 17c52 (Xcode 26.2), macOS host from Mac-15.5|Mac-15.7 to Mac-15.7, and simulator runtime from ios-18-2 to ios-26-2. Replaces 18.2 golden images with 26.2 goldens and updates generate_builder_json.dart. device_os remains iOS-18 for devicelab targets (physical devices not yet upgraded). Fixes #172855 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## 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. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] 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 [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 de77b89 commit de9436d

69 files changed

Lines changed: 320 additions & 320 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ platform_properties:
166166
[
167167
{"dependency": "apple_signing", "version": "version:to_2026"}
168168
]
169-
os: Mac-15.5|Mac-15.7
169+
os: Mac-15.7
170170
device_type: none
171171
$flutter/osx_sdk : >-
172172
{
173-
"sdk_version": "16c5032a"
173+
"sdk_version": "17c52"
174174
}
175175
176176
mac_arm64:
@@ -183,12 +183,12 @@ platform_properties:
183183
[
184184
{"dependency": "apple_signing", "version": "version:to_2026"}
185185
]
186-
os: Mac-15.5|Mac-15.7
186+
os: Mac-15.7
187187
device_type: none
188188
cpu: arm64
189189
$flutter/osx_sdk : >-
190190
{
191-
"sdk_version": "16c5032a"
191+
"sdk_version": "17c52"
192192
}
193193
194194
mac_benchmark:
@@ -203,12 +203,12 @@ platform_properties:
203203
]
204204
device_type: none
205205
mac_model: "Macmini8,1"
206-
os: Mac-15.5|Mac-15.7
206+
os: Mac-15.7
207207
tags: >
208208
["devicelab", "hostonly", "mac"]
209209
$flutter/osx_sdk : >-
210210
{
211-
"sdk_version": "16c5032a"
211+
"sdk_version": "17c52"
212212
}
213213
214214
mac_x64:
@@ -221,12 +221,12 @@ platform_properties:
221221
[
222222
{"dependency": "apple_signing", "version": "version:to_2026"}
223223
]
224-
os: Mac-15.5|Mac-15.7
224+
os: Mac-15.7
225225
device_type: none
226226
cpu: x86
227227
$flutter/osx_sdk : >-
228228
{
229-
"sdk_version": "16c5032a"
229+
"sdk_version": "17c52"
230230
}
231231
232232
mac_build_test:
@@ -240,12 +240,12 @@ platform_properties:
240240
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
241241
{"dependency": "apple_signing", "version": "version:to_2026"}
242242
]
243-
os: Mac-15.5|Mac-15.7
243+
os: Mac-15.7
244244
device_type: none
245245
cpu: x86
246246
$flutter/osx_sdk : >-
247247
{
248-
"sdk_version": "16c5032a"
248+
"sdk_version": "17c52"
249249
}
250250
251251
mac_mokey:
@@ -256,7 +256,7 @@ platform_properties:
256256
{"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
257257
{"dependency": "open_jdk", "version": "version:21"}
258258
]
259-
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
259+
os: Mac-15.7
260260
cpu: x86
261261
device_type: "mokey"
262262

@@ -267,7 +267,7 @@ platform_properties:
267267
{"dependency": "android_sdk", "version": "version:36v8unmodified"},
268268
{"dependency": "open_jdk", "version": "version:21"}
269269
]
270-
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
270+
os: Mac-15.7
271271
cpu: arm64
272272
device_type: "mokey"
273273

@@ -282,11 +282,11 @@ platform_properties:
282282
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
283283
{"dependency": "apple_signing", "version": "version:to_2026"}
284284
]
285-
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
285+
os: Mac-15.7
286286
device_os: iOS-18
287287
$flutter/osx_sdk : >-
288288
{
289-
"sdk_version": "16c5032a"
289+
"sdk_version": "17c52"
290290
}
291291
292292
mac_x64_ios:
@@ -300,12 +300,12 @@ platform_properties:
300300
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
301301
{"dependency": "apple_signing", "version": "version:to_2026"}
302302
]
303-
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
303+
os: Mac-15.7
304304
cpu: x86
305305
device_os: iOS-18
306306
$flutter/osx_sdk : >-
307307
{
308-
"sdk_version": "16c5032a"
308+
"sdk_version": "17c52"
309309
}
310310
311311
mac_arm64_ios:
@@ -319,12 +319,12 @@ platform_properties:
319319
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
320320
{"dependency": "apple_signing", "version": "none"}
321321
]
322-
os: Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7
322+
os: Mac-15.7
323323
cpu: arm64
324324
device_os: iOS-18
325325
$flutter/osx_sdk : >-
326326
{
327-
"sdk_version": "16c5032a"
327+
"sdk_version": "17c52"
328328
}
329329
330330
windows:
@@ -5477,10 +5477,10 @@ targets:
54775477
tags: >
54785478
["devicelab", "ios", "mac"]
54795479
task_name: ios_debug_workflow
5480-
os: Mac-15.5|Mac-15.7
5480+
os: Mac-15.7
54815481
$flutter/osx_sdk : >-
54825482
{
5483-
"sdk_version": "17a5295f"
5483+
"sdk_version": "17c52"
54845484
}
54855485
54865486
- name: Mac_ios fullscreen_textfield_perf_ios__e2e_summary
@@ -5519,7 +5519,7 @@ targets:
55195519
["devicelab", "ios", "mac"]
55205520
task_name: flutter_gallery__transition_perf_e2e_ios
55215521
drone_dimensions: >
5522-
["device_os=iOS-18","os=Mac-15.1|Mac-15.5|Mac-15.6|Mac-15.7", "cpu=x86"]
5522+
["device_os=iOS-18","os=Mac-15.7", "cpu=x86"]
55235523
55245524
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
55255525
recipe: devicelab/devicelab_drone

‎engine/src/flutter/.ci.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ platform_properties:
3030
{"dependency": "open_jdk", "version": "version:21"}
3131
]
3232
device_type: none
33-
os: Mac-15.5|Mac-15.7
33+
os: Mac-15.7
3434
$flutter/osx_sdk : >-
3535
{
36-
"sdk_version": "16c5032a"
36+
"sdk_version": "17c52"
3737
}
3838
windows:
3939
properties:
@@ -465,12 +465,12 @@ targets:
465465
]
466466
$flutter/osx_sdk : >-
467467
{
468-
"sdk_version": "16c5032a"
468+
"sdk_version": "17c52"
469469
}
470470
# Do not remove(https://github.com/flutter/flutter/issues/144644)
471471
# Scheduler will fail to get the platform
472472
drone_dimensions:
473-
- os=Mac-15.5|Mac-15.7
473+
- os=Mac-15.7
474474

475475
- name: Mac clangd
476476
recipe: engine_v2/builder
@@ -494,12 +494,12 @@ targets:
494494
config_name: mac_ios_engine
495495
$flutter/osx_sdk : >-
496496
{
497-
"sdk_version": "16c5032a"
497+
"sdk_version": "17c52"
498498
}
499499
# Do not remove(https://github.com/flutter/flutter/issues/144644)
500500
# Scheduler will fail to get the platform
501501
drone_dimensions:
502-
- os=Mac-15.5|Mac-15.7
502+
- os=Mac-15.7
503503
- cpu=x86
504504

505505
- name: Mac mac_ios_engine_ddm
@@ -514,12 +514,12 @@ targets:
514514
config_name: mac_ios_engine_ddm
515515
$flutter/osx_sdk : >-
516516
{
517-
"sdk_version": "16c5032a"
517+
"sdk_version": "17c52"
518518
}
519519
# Do not remove(https://github.com/flutter/flutter/issues/144644)
520520
# Scheduler will fail to get the platform
521521
drone_dimensions:
522-
- os=Mac-15.5|Mac-15.7
522+
- os=Mac-15.7
523523
- cpu=x86
524524

525525
- name: Linux windows_android_aot_engine

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
"recipe": "engine_v2/tester_engine",
494494
"drone_dimensions": [
495495
"device_type=none",
496-
"os=Mac-15.5|Mac-15.7",
496+
"os=Mac-15.7",
497497
"cpu=arm64"
498498
],
499499
"gclient_variables": {

0 commit comments

Comments
 (0)