Skip to content

Commit 4ca2f2d

Browse files
okorohelijahIvoneDjaja
okorohelijah
authored and
IvoneDjaja
committed
Update .ci.yaml in flutter/flutter to use 15.5 (flutter#177939)
Update .ci.yaml in flutter/flutter to use 15.5 Note: (Not all devicelab bots are macOS 15.5. Some are 15.1 and 15.6.1) *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* Fixes flutter#177394 *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 [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 `///`). - [x] 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]. **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 [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 5dd51f3 commit 4ca2f2d

File tree

10 files changed

+87
-87
lines changed

10 files changed

+87
-87
lines changed

‎.ci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ platform_properties:
166166
[
167167
{"dependency": "apple_signing", "version": "version:to_2026"}
168168
]
169-
os: Mac-14|Mac-15
169+
os: Mac-15.5
170170
device_type: none
171171
$flutter/osx_sdk : >-
172172
{
@@ -183,7 +183,7 @@ platform_properties:
183183
[
184184
{"dependency": "apple_signing", "version": "version:to_2026"}
185185
]
186-
os: Mac-14|Mac-15
186+
os: Mac-15.5
187187
device_type: none
188188
cpu: arm64
189189
$flutter/osx_sdk : >-
@@ -203,7 +203,7 @@ platform_properties:
203203
]
204204
device_type: none
205205
mac_model: "Macmini8,1"
206-
os: Mac-14|Mac-15
206+
os: Mac-15.5
207207
tags: >
208208
["devicelab", "hostonly", "mac"]
209209
$flutter/osx_sdk : >-
@@ -221,7 +221,7 @@ platform_properties:
221221
[
222222
{"dependency": "apple_signing", "version": "version:to_2026"}
223223
]
224-
os: Mac-14|Mac-15
224+
os: Mac-15.5
225225
device_type: none
226226
cpu: x86
227227
$flutter/osx_sdk : >-
@@ -240,7 +240,7 @@ platform_properties:
240240
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
241241
{"dependency": "apple_signing", "version": "version:to_2026"}
242242
]
243-
os: Mac-14|Mac-15
243+
os: Mac-15.5
244244
device_type: none
245245
cpu: x86
246246
$flutter/osx_sdk : >-
@@ -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-14|Mac-15
259+
os: Mac-15.1|Mac-15.5|Mac-15.6
260260
cpu: x86
261261
device_type: "mokey"
262262

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

@@ -282,7 +282,7 @@ platform_properties:
282282
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
283283
{"dependency": "apple_signing", "version": "version:to_2026"}
284284
]
285-
os: Mac-14|Mac-15
285+
os: Mac-15.1|Mac-15.5|Mac-15.6
286286
device_os: iOS-18
287287
$flutter/osx_sdk : >-
288288
{
@@ -300,7 +300,7 @@ platform_properties:
300300
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
301301
{"dependency": "apple_signing", "version": "version:to_2026"}
302302
]
303-
os: Mac-14|Mac-15
303+
os: Mac-15.1|Mac-15.5|Mac-15.6
304304
cpu: x86
305305
device_os: iOS-18
306306
$flutter/osx_sdk : >-
@@ -319,7 +319,7 @@ platform_properties:
319319
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
320320
{"dependency": "apple_signing", "version": "none"}
321321
]
322-
os: Mac-14|Mac-15
322+
os: Mac-15.1|Mac-15.5|Mac-15.6
323323
cpu: arm64
324324
device_os: iOS-18
325325
$flutter/osx_sdk : >-
@@ -5559,7 +5559,7 @@ targets:
55595559
tags: >
55605560
["devicelab", "ios", "mac"]
55615561
task_name: ios_debug_workflow
5562-
os: Mac-15
5562+
os: Mac-15.5
55635563
$flutter/osx_sdk : >-
55645564
{
55655565
"sdk_version": "17a5295f"
@@ -5601,7 +5601,7 @@ targets:
56015601
["devicelab", "ios", "mac"]
56025602
task_name: flutter_gallery__transition_perf_e2e_ios
56035603
drone_dimensions: >
5604-
["device_os=iOS-18","os=Mac-14|Mac-15", "cpu=x86"]
5604+
["device_os=iOS-18","os=Mac-15.1|Mac-15.5|Mac-15.6", "cpu=x86"]
56055605
56065606
- name: Mac_ios animated_blur_backdrop_filter_perf_ios__timeline_summary
56075607
recipe: devicelab/devicelab_drone

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ platform_properties:
3030
{"dependency": "open_jdk", "version": "version:21"}
3131
]
3232
device_type: none
33-
os: Mac-14|Mac-15
33+
os: Mac-15.5
3434
$flutter/osx_sdk : >-
3535
{
3636
"sdk_version": "16c5032a"
@@ -470,7 +470,7 @@ targets:
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-14|Mac-15
473+
- os=Mac-15.5
474474

475475
- name: Mac clangd
476476
recipe: engine_v2/builder
@@ -499,7 +499,7 @@ targets:
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-14|Mac-15
502+
- os=Mac-15.5
503503
- cpu=x86
504504

505505
- name: Mac mac_ios_engine_ddm
@@ -519,7 +519,7 @@ targets:
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-14|Mac-15
522+
- os=Mac-15.5
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
@@ -397,7 +397,7 @@
397397
"recipe": "engine_v2/tester_engine",
398398
"drone_dimensions": [
399399
"device_type=none",
400-
"os=Mac-14|Mac-15",
400+
"os=Mac-15.5",
401401
"cpu=arm64"
402402
],
403403
"gclient_variables": {

‎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-14|Mac-15",
6+
"os=Mac-15.5",
77
"device_type=none"
88
],
99
"gclient_variables": {
@@ -36,7 +36,7 @@
3636
{
3737
"cas_archive": false,
3838
"drone_dimensions": [
39-
"os=Mac-14|Mac-15",
39+
"os=Mac-15.5",
4040
"device_type=none"
4141
],
4242
"gclient_variables": {
@@ -70,7 +70,7 @@
7070
{
7171
"cas_archive": false,
7272
"drone_dimensions": [
73-
"os=Mac-14|Mac-15",
73+
"os=Mac-15.5",
7474
"device_type=none"
7575
],
7676
"gclient_variables": {
@@ -103,7 +103,7 @@
103103
{
104104
"cas_archive": false,
105105
"drone_dimensions": [
106-
"os=Mac-14|Mac-15",
106+
"os=Mac-15.5",
107107
"device_type=none"
108108
],
109109
"gclient_variables": {
@@ -136,7 +136,7 @@
136136
{
137137
"cas_archive": false,
138138
"drone_dimensions": [
139-
"os=Mac-14|Mac-15",
139+
"os=Mac-15.5",
140140
"device_type=none"
141141
],
142142
"gclient_variables": {
@@ -170,7 +170,7 @@
170170
{
171171
"cas_archive": false,
172172
"drone_dimensions": [
173-
"os=Mac-14|Mac-15",
173+
"os=Mac-15.5",
174174
"device_type=none"
175175
],
176176
"gclient_variables": {
@@ -206,7 +206,7 @@
206206
{
207207
"cas_archive": false,
208208
"drone_dimensions": [
209-
"os=Mac-14|Mac-15",
209+
"os=Mac-15.5",
210210
"device_type=none"
211211
],
212212
"gclient_variables": {
@@ -370,7 +370,7 @@
370370
{
371371
"cas_archive": false,
372372
"drone_dimensions": [
373-
"os=Mac-14|Mac-15",
373+
"os=Mac-15.5",
374374
"device_type=none"
375375
],
376376
"gclient_variables": {
@@ -403,7 +403,7 @@
403403
{
404404
"cas_archive": false,
405405
"drone_dimensions": [
406-
"os=Mac-14|Mac-15",
406+
"os=Mac-15.5",
407407
"device_type=none"
408408
],
409409
"gclient_variables": {
@@ -436,7 +436,7 @@
436436
{
437437
"cas_archive": false,
438438
"drone_dimensions": [
439-
"os=Mac-14|Mac-15",
439+
"os=Mac-15.5",
440440
"device_type=none"
441441
],
442442
"gclient_variables": {
@@ -520,7 +520,7 @@
520520
{
521521
"cas_archive": false,
522522
"drone_dimensions": [
523-
"os=Mac-14|Mac-15",
523+
"os=Mac-15.5",
524524
"device_type=none"
525525
],
526526
"gclient_variables": {
@@ -604,7 +604,7 @@
604604
{
605605
"cas_archive": false,
606606
"drone_dimensions": [
607-
"os=Mac-14|Mac-15",
607+
"os=Mac-15.5",
608608
"device_type=none"
609609
],
610610
"gclient_variables": {
@@ -636,7 +636,7 @@
636636
{
637637
"cas_archive": false,
638638
"drone_dimensions": [
639-
"os=Mac-14|Mac-15",
639+
"os=Mac-15.5",
640640
"device_type=none"
641641
],
642642
"gclient_variables": {
@@ -669,7 +669,7 @@
669669
{
670670
"cas_archive": false,
671671
"drone_dimensions": [
672-
"os=Mac-14|Mac-15",
672+
"os=Mac-15.5",
673673
"device_type=none"
674674
],
675675
"gclient_variables": {
@@ -702,7 +702,7 @@
702702
{
703703
"cas_archive": false,
704704
"drone_dimensions": [
705-
"os=Mac-14|Mac-15",
705+
"os=Mac-15.5",
706706
"device_type=none"
707707
],
708708
"gclient_variables": {
@@ -841,7 +841,7 @@
841841
{
842842
"cas_archive": false,
843843
"drone_dimensions": [
844-
"os=Mac-14|Mac-15",
844+
"os=Mac-15.5",
845845
"device_type=none"
846846
],
847847
"gclient_variables": {
@@ -925,7 +925,7 @@
925925
{
926926
"cas_archive": false,
927927
"drone_dimensions": [
928-
"os=Mac-14|Mac-15",
928+
"os=Mac-15.5",
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-14|Mac-15"
1066+
"os=Mac-15.5"
10671067
],
10681068
"gclient_variables": {
10691069
"download_android_deps": false,
@@ -1093,7 +1093,7 @@
10931093
"name": "macos/wasm_debug_unopt",
10941094
"drone_dimensions": [
10951095
"device_type=none",
1096-
"os=Mac-14|Mac-15"
1096+
"os=Mac-15.5"
10971097
],
10981098
"gclient_variables": {
10991099
"download_android_deps": false,

‎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-14|Mac-15",
28+
"os=Mac-15.5",
2929
"cpu=x86"
3030
],
3131
"gclient_variables": {
@@ -83,7 +83,7 @@
8383
],
8484
"drone_dimensions": [
8585
"device_type=none",
86-
"os=Mac-14|Mac-15",
86+
"os=Mac-15.5",
8787
"cpu=x86"
8888
],
8989
"gclient_variables": {
@@ -143,7 +143,7 @@
143143
],
144144
"drone_dimensions": [
145145
"device_type=none",
146-
"os=Mac-14|Mac-15",
146+
"os=Mac-15.5",
147147
"cpu=x86"
148148
],
149149
"gclient_variables": {
@@ -203,7 +203,7 @@
203203
],
204204
"drone_dimensions": [
205205
"device_type=none",
206-
"os=Mac-14|Mac-15",
206+
"os=Mac-15.5",
207207
"cpu=x86"
208208
],
209209
"gclient_variables": {
@@ -261,7 +261,7 @@
261261
],
262262
"drone_dimensions": [
263263
"device_type=none",
264-
"os=Mac-14|Mac-15",
264+
"os=Mac-15.5",
265265
"cpu=x86"
266266
],
267267
"gclient_variables": {
@@ -321,7 +321,7 @@
321321
],
322322
"drone_dimensions": [
323323
"device_type=none",
324-
"os=Mac-14|Mac-15",
324+
"os=Mac-15.5",
325325
"cpu=x86"
326326
],
327327
"gclient_variables": {

0 commit comments

Comments
 (0)