Skip to content

Commit 4d8bbce

Browse files
Allow macOS tests to use macOS 15 or 26 (flutter#193317)
Part of flutter#192568 The following tests are kept on 15 due to failing testing. We will fix once we have macOS 26 bots in the try pool: * Mac framework_tests_libraries * Mac framework_tests_impeller * Mac framework_tests_widgets * Mac_build_test flutter_gallery__transition_perf_e2e_ios * Mac mac_unopt < ci/mac_release_arm64_tests * Linux linux_web_engine_tests < Mac run safari suites ## 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 --------- Co-authored-by: Jackson Gardner <[email protected]>
1 parent 929df56 commit 4d8bbce

9 files changed

Lines changed: 87 additions & 84 deletions

File tree

‎.ci.yaml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ platform_properties:
175175
[
176176
{"dependency": "apple_signing", "version": "version:to_2027"}
177177
]
178-
os: Mac-15.7
178+
os: Mac-15.7|Mac-26.6
179179
device_type: none
180180
$flutter/osx_sdk : >-
181181
{
@@ -192,7 +192,7 @@ platform_properties:
192192
[
193193
{"dependency": "apple_signing", "version": "version:to_2027"}
194194
]
195-
os: Mac-15.7
195+
os: Mac-15.7|Mac-26.6
196196
device_type: none
197197
cpu: arm64
198198
$flutter/osx_sdk : >-
@@ -217,7 +217,7 @@ platform_properties:
217217
# (https://flutter.dev/go/macos-intel-deprecation).
218218
mac_model: "Macmini9,1"
219219
cpu: arm64
220-
os: Mac-15.7
220+
os: Mac-15.7|Mac-26.6
221221
tags: >
222222
["devicelab", "hostonly", "mac", "arm64"]
223223
$flutter/osx_sdk : >-
@@ -235,7 +235,7 @@ platform_properties:
235235
[
236236
{"dependency": "apple_signing", "version": "version:to_2027"}
237237
]
238-
os: Mac-15.7
238+
os: Mac-15.7|Mac-26.6
239239
device_type: none
240240
cpu: x86
241241
$flutter/osx_sdk : >-
@@ -271,7 +271,7 @@ platform_properties:
271271
{"dependency": "open_jdk", "version": "version:21"},
272272
{"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
273273
]
274-
os: Mac-15.7
274+
os: Mac-15.7|Mac-26.6
275275
cpu: x86
276276
device_type: "mokey"
277277

@@ -283,7 +283,7 @@ platform_properties:
283283
{"dependency": "open_jdk", "version": "version:21"},
284284
{"dependency": "gradle_dists", "version": "8.4-bin:8.13-rc-1-bin:8.14-bin:9.3.1-bin:9.3.1-all"}
285285
]
286-
os: Mac-15.7
286+
os: Mac-15.7|Mac-26.6
287287
cpu: arm64
288288
device_type: "mokey"
289289

@@ -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 : >-
@@ -4236,6 +4236,7 @@ targets:
42364236
recipe: flutter/flutter_drone
42374237
timeout: 60
42384238
properties:
4239+
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193155
42394240
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
42404241
dependencies: >-
42414242
[
@@ -4264,6 +4265,7 @@ targets:
42644265
recipe: flutter/flutter_drone
42654266
timeout: 60
42664267
properties:
4268+
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193157
42674269
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
42684270
dependencies: >-
42694271
[
@@ -4359,6 +4361,7 @@ targets:
43594361
recipe: flutter/flutter_drone
43604362
timeout: 60
43614363
properties:
4364+
os: Mac-15.7 # https://github.com/flutter/flutter/issues/193158
43624365
cpu: arm64 # https://github.com/flutter/flutter/issues/119880
43634366
dependencies: >-
43644367
[

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ platform_properties:
3131
{"dependency": "open_jdk", "version": "version:21"}
3232
]
3333
device_type: none
34-
os: Mac-15.7
34+
os: Mac-15.7|Mac-26.6
3535
$flutter/osx_sdk : >-
3636
{
3737
"sdk_version": "17c52"
@@ -491,7 +491,7 @@ targets:
491491
# Do not remove(https://github.com/flutter/flutter/issues/144644)
492492
# Scheduler will fail to get the platform
493493
drone_dimensions:
494-
- os=Mac-15.7
494+
- os=Mac-15.7|Mac-26.6
495495

496496
- name: Mac clangd
497497
recipe: engine_v2/builder
@@ -520,7 +520,7 @@ targets:
520520
# Do not remove(https://github.com/flutter/flutter/issues/144644)
521521
# Scheduler will fail to get the platform
522522
drone_dimensions:
523-
- os=Mac-15.7
523+
- os=Mac-15.7|Mac-26.6
524524
- cpu=x86
525525

526526
- name: Mac mac_ios_engine_ddm
@@ -540,7 +540,7 @@ targets:
540540
# Do not remove(https://github.com/flutter/flutter/issues/144644)
541541
# Scheduler will fail to get the platform
542542
drone_dimensions:
543-
- os=Mac-15.7
543+
- os=Mac-15.7|Mac-26.6
544544
- cpu=x86
545545

546546
- name: Linux windows_android_aot_engine

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"cas_archive": false,
55
"drone_dimensions": [
6-
"os=Mac-15.7",
6+
"os=Mac-15.7|Mac-26.6",
77
"device_type=none"
88
],
99
"gclient_variables": {
@@ -36,7 +36,7 @@
3636
{
3737
"cas_archive": false,
3838
"drone_dimensions": [
39-
"os=Mac-15.7",
39+
"os=Mac-15.7|Mac-26.6",
4040
"device_type=none"
4141
],
4242
"gclient_variables": {
@@ -70,7 +70,7 @@
7070
{
7171
"cas_archive": false,
7272
"drone_dimensions": [
73-
"os=Mac-15.7",
73+
"os=Mac-15.7|Mac-26.6",
7474
"device_type=none"
7575
],
7676
"gclient_variables": {
@@ -103,7 +103,7 @@
103103
{
104104
"cas_archive": false,
105105
"drone_dimensions": [
106-
"os=Mac-15.7",
106+
"os=Mac-15.7|Mac-26.6",
107107
"device_type=none"
108108
],
109109
"gclient_variables": {
@@ -136,7 +136,7 @@
136136
{
137137
"cas_archive": false,
138138
"drone_dimensions": [
139-
"os=Mac-15.7",
139+
"os=Mac-15.7|Mac-26.6",
140140
"device_type=none"
141141
],
142142
"gclient_variables": {
@@ -170,7 +170,7 @@
170170
{
171171
"cas_archive": false,
172172
"drone_dimensions": [
173-
"os=Mac-15.7",
173+
"os=Mac-15.7|Mac-26.6",
174174
"device_type=none"
175175
],
176176
"gclient_variables": {
@@ -206,7 +206,7 @@
206206
{
207207
"cas_archive": false,
208208
"drone_dimensions": [
209-
"os=Mac-15.7",
209+
"os=Mac-15.7|Mac-26.6",
210210
"device_type=none"
211211
],
212212
"gclient_variables": {
@@ -370,7 +370,7 @@
370370
{
371371
"cas_archive": false,
372372
"drone_dimensions": [
373-
"os=Mac-15.7",
373+
"os=Mac-15.7|Mac-26.6",
374374
"device_type=none"
375375
],
376376
"gclient_variables": {
@@ -403,7 +403,7 @@
403403
{
404404
"cas_archive": false,
405405
"drone_dimensions": [
406-
"os=Mac-15.7",
406+
"os=Mac-15.7|Mac-26.6",
407407
"device_type=none"
408408
],
409409
"gclient_variables": {
@@ -436,7 +436,7 @@
436436
{
437437
"cas_archive": false,
438438
"drone_dimensions": [
439-
"os=Mac-15.7",
439+
"os=Mac-15.7|Mac-26.6",
440440
"device_type=none"
441441
],
442442
"gclient_variables": {
@@ -520,7 +520,7 @@
520520
{
521521
"cas_archive": false,
522522
"drone_dimensions": [
523-
"os=Mac-15.7",
523+
"os=Mac-15.7|Mac-26.6",
524524
"device_type=none"
525525
],
526526
"gclient_variables": {
@@ -604,7 +604,7 @@
604604
{
605605
"cas_archive": false,
606606
"drone_dimensions": [
607-
"os=Mac-15.7",
607+
"os=Mac-15.7|Mac-26.6",
608608
"device_type=none"
609609
],
610610
"gclient_variables": {
@@ -636,7 +636,7 @@
636636
{
637637
"cas_archive": false,
638638
"drone_dimensions": [
639-
"os=Mac-15.7",
639+
"os=Mac-15.7|Mac-26.6",
640640
"device_type=none"
641641
],
642642
"gclient_variables": {
@@ -669,7 +669,7 @@
669669
{
670670
"cas_archive": false,
671671
"drone_dimensions": [
672-
"os=Mac-15.7",
672+
"os=Mac-15.7|Mac-26.6",
673673
"device_type=none"
674674
],
675675
"gclient_variables": {
@@ -702,7 +702,7 @@
702702
{
703703
"cas_archive": false,
704704
"drone_dimensions": [
705-
"os=Mac-15.7",
705+
"os=Mac-15.7|Mac-26.6",
706706
"device_type=none"
707707
],
708708
"gclient_variables": {
@@ -841,7 +841,7 @@
841841
{
842842
"cas_archive": false,
843843
"drone_dimensions": [
844-
"os=Mac-15.7",
844+
"os=Mac-15.7|Mac-26.6",
845845
"device_type=none"
846846
],
847847
"gclient_variables": {
@@ -925,7 +925,7 @@
925925
{
926926
"cas_archive": false,
927927
"drone_dimensions": [
928-
"os=Mac-15.7",
928+
"os=Mac-15.7|Mac-26.6",
929929
"device_type=none"
930930
],
931931
"gclient_variables": {
@@ -1063,7 +1063,7 @@
10631063
"name": "macos/wasm_release",
10641064
"drone_dimensions": [
10651065
"device_type=none",
1066-
"os=Mac-15.7",
1066+
"os=Mac-15.7|Mac-26.6",
10671067
"cpu=arm64"
10681068
],
10691069
"gclient_variables": {
@@ -1100,7 +1100,7 @@
11001100
"name": "macos/wasm_debug_unopt",
11011101
"drone_dimensions": [
11021102
"device_type=none",
1103-
"os=Mac-15.7",
1103+
"os=Mac-15.7|Mac-26.6",
11041104
"cpu=arm64"
11051105
],
11061106
"gclient_variables": {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"drone_dimensions": [
2727
"device_type=none",
28-
"os=Mac-15.7",
28+
"os=Mac-15.7|Mac-26.6",
2929
"cpu=x86"
3030
],
3131
"gclient_variables": {
@@ -83,7 +83,7 @@
8383
],
8484
"drone_dimensions": [
8585
"device_type=none",
86-
"os=Mac-15.7",
86+
"os=Mac-15.7|Mac-26.6",
8787
"cpu=x86"
8888
],
8989
"gclient_variables": {
@@ -143,7 +143,7 @@
143143
],
144144
"drone_dimensions": [
145145
"device_type=none",
146-
"os=Mac-15.7",
146+
"os=Mac-15.7|Mac-26.6",
147147
"cpu=x86"
148148
],
149149
"gclient_variables": {
@@ -203,7 +203,7 @@
203203
],
204204
"drone_dimensions": [
205205
"device_type=none",
206-
"os=Mac-15.7",
206+
"os=Mac-15.7|Mac-26.6",
207207
"cpu=x86"
208208
],
209209
"gclient_variables": {
@@ -261,7 +261,7 @@
261261
],
262262
"drone_dimensions": [
263263
"device_type=none",
264-
"os=Mac-15.7",
264+
"os=Mac-15.7|Mac-26.6",
265265
"cpu=x86"
266266
],
267267
"gclient_variables": {
@@ -321,7 +321,7 @@
321321
],
322322
"drone_dimensions": [
323323
"device_type=none",
324-
"os=Mac-15.7",
324+
"os=Mac-15.7|Mac-26.6",
325325
"cpu=x86"
326326
],
327327
"gclient_variables": {

0 commit comments

Comments
 (0)