Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 6e3a048

Browse files
vashworthvashworth
authored
Run tests on macOS 13 exclusively (#49099)
Release team wants engine tests running exclusively on macOS 13 in main for a while before CP'ing to beta. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent a8d861b commit 6e3a048

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎.ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ platform_properties:
3131
]
3232
device_type: none
3333
cpu: x86
34-
os: Mac-12|Mac-13
34+
os: Mac-13
3535
$flutter/osx_sdk : >-
3636
{
3737
"sdk_version": "14e300c"
@@ -368,7 +368,7 @@ targets:
368368
"sdk_version": "14e300c"
369369
}
370370
drone_dimensions:
371-
- os=Mac-12|Mac-13
371+
- os=Mac-13
372372

373373
- name: Linux mac_unopt
374374
recipe: engine_v2/engine_v2
@@ -389,7 +389,7 @@ targets:
389389
"sdk_version": "14e300c"
390390
}
391391
drone_dimensions:
392-
- os=Mac-12|Mac-13
392+
- os=Mac-13
393393
- cpu=x86
394394

395395
- name: Mac impeller-cmake-example

‎ci/builders/mac_android_aot_engine.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"drone_dimensions": [
1616
"device_type=none",
17-
"os=Mac-12|Mac-13",
17+
"os=Mac-13",
1818
"cpu=x86"
1919
],
2020
"gclient_variables": {
@@ -53,7 +53,7 @@
5353
],
5454
"drone_dimensions": [
5555
"device_type=none",
56-
"os=Mac-12|Mac-13",
56+
"os=Mac-13",
5757
"cpu=x86"
5858
],
5959
"gclient_variables": {
@@ -93,7 +93,7 @@
9393
],
9494
"drone_dimensions": [
9595
"device_type=none",
96-
"os=Mac-12|Mac-13",
96+
"os=Mac-13",
9797
"cpu=x86"
9898
],
9999
"gclient_variables": {
@@ -133,7 +133,7 @@
133133
],
134134
"drone_dimensions": [
135135
"device_type=none",
136-
"os=Mac-12|Mac-13",
136+
"os=Mac-13",
137137
"cpu=x86"
138138
],
139139
"gclient_variables": {
@@ -172,7 +172,7 @@
172172
],
173173
"drone_dimensions": [
174174
"device_type=none",
175-
"os=Mac-12|Mac-13",
175+
"os=Mac-13",
176176
"cpu=x86"
177177
],
178178
"gclient_variables": {
@@ -212,7 +212,7 @@
212212
],
213213
"drone_dimensions": [
214214
"device_type=none",
215-
"os=Mac-12|Mac-13",
215+
"os=Mac-13",
216216
"cpu=x86"
217217
],
218218
"gclient_variables": {

‎ci/builders/mac_clang_tidy.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"drone_dimensions": [
55
"device_type=none",
6-
"os=Mac-12|Mac-13",
6+
"os=Mac-13",
77
"cpu=arm64"
88
],
99
"gclient_variables": {
@@ -24,7 +24,7 @@
2424
{
2525
"drone_dimensions": [
2626
"device_type=none",
27-
"os=Mac-12|Mac-13",
27+
"os=Mac-13",
2828
"cpu=arm64"
2929
],
3030
"gclient_variables": {
@@ -50,7 +50,7 @@
5050
"recipe": "engine_v2/tester_engine",
5151
"drone_dimensions": [
5252
"device_type=none",
53-
"os=Mac-12|Mac-13",
53+
"os=Mac-13",
5454
"cpu=arm64"
5555
],
5656
"gclient_variables": {
@@ -82,7 +82,7 @@
8282
"recipe": "engine_v2/tester_engine",
8383
"drone_dimensions": [
8484
"device_type=none",
85-
"os=Mac-12|Mac-13",
85+
"os=Mac-13",
8686
"cpu=arm64"
8787
],
8888
"gclient_variables": {
@@ -114,7 +114,7 @@
114114
"recipe": "engine_v2/tester_engine",
115115
"drone_dimensions": [
116116
"device_type=none",
117-
"os=Mac-12|Mac-13",
117+
"os=Mac-13",
118118
"cpu=arm64"
119119
],
120120
"gclient_variables": {
@@ -146,7 +146,7 @@
146146
"recipe": "engine_v2/tester_engine",
147147
"drone_dimensions": [
148148
"device_type=none",
149-
"os=Mac-12|Mac-13",
149+
"os=Mac-13",
150150
"cpu=arm64"
151151
],
152152
"gclient_variables": {
@@ -178,7 +178,7 @@
178178
"recipe": "engine_v2/tester_engine",
179179
"drone_dimensions": [
180180
"device_type=none",
181-
"os=Mac-12|Mac-13",
181+
"os=Mac-13",
182182
"cpu=arm64"
183183
],
184184
"gclient_variables": {

‎ci/builders/mac_host_engine.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"drone_dimensions": [
1717
"device_type=none",
18-
"os=Mac-12|Mac-13",
18+
"os=Mac-13",
1919
"cpu=x86",
2020
"mac_model=Macmini8,1"
2121
],
@@ -79,7 +79,7 @@
7979
],
8080
"drone_dimensions": [
8181
"device_type=none",
82-
"os=Mac-12|Mac-13",
82+
"os=Mac-13",
8383
"cpu=x86",
8484
"mac_model=Macmini8,1"
8585
],
@@ -139,7 +139,7 @@
139139
],
140140
"drone_dimensions": [
141141
"device_type=none",
142-
"os=Mac-12|Mac-13",
142+
"os=Mac-13",
143143
"cpu=x86",
144144
"mac_model=Macmini8,1"
145145
],
@@ -208,7 +208,7 @@
208208
],
209209
"drone_dimensions": [
210210
"device_type=none",
211-
"os=Mac-12|Mac-13",
211+
"os=Mac-13",
212212
"cpu=x86"
213213
],
214214
"gclient_variables": {
@@ -255,7 +255,7 @@
255255
],
256256
"drone_dimensions": [
257257
"device_type=none",
258-
"os=Mac-12|Mac-13",
258+
"os=Mac-13",
259259
"cpu=x86"
260260
],
261261
"gclient_variables": {
@@ -299,7 +299,7 @@
299299
],
300300
"drone_dimensions": [
301301
"device_type=none",
302-
"os=Mac-12|Mac-13",
302+
"os=Mac-13",
303303
"cpu=x86"
304304
],
305305
"gclient_variables": {

‎ci/builders/mac_impeller_cmake_example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"archives": [],
66
"drone_dimensions": [
77
"device_type=none",
8-
"os=Mac-12|Mac-13",
8+
"os=Mac-13",
99
"cpu=arm64"
1010
],
1111
"gclient_variables": {

‎ci/builders/mac_ios_engine.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"drone_dimensions": [
55
"device_type=none",
6-
"os=Mac-12|Mac-13",
6+
"os=Mac-13",
77
"cpu=x86"
88
],
99
"gn": [
@@ -26,7 +26,7 @@
2626
{
2727
"drone_dimensions": [
2828
"device_type=none",
29-
"os=Mac-12|Mac-13",
29+
"os=Mac-13",
3030
"cpu=x86"
3131
],
3232
"gn": [
@@ -50,7 +50,7 @@
5050
{
5151
"drone_dimensions": [
5252
"device_type=none",
53-
"os=Mac-12|Mac-13",
53+
"os=Mac-13",
5454
"cpu=x86"
5555
],
5656
"gn": [
@@ -74,7 +74,7 @@
7474
{
7575
"drone_dimensions": [
7676
"device_type=none",
77-
"os=Mac-12|Mac-13",
77+
"os=Mac-13",
7878
"cpu=x86"
7979
],
8080
"gn": [
@@ -99,7 +99,7 @@
9999
{
100100
"drone_dimensions": [
101101
"device_type=none",
102-
"os=Mac-12|Mac-13",
102+
"os=Mac-13",
103103
"cpu=x86"
104104
],
105105
"gn": [
@@ -124,7 +124,7 @@
124124
{
125125
"drone_dimensions": [
126126
"device_type=none",
127-
"os=Mac-12|Mac-13",
127+
"os=Mac-13",
128128
"cpu=x86"
129129
],
130130
"gn": [
@@ -148,7 +148,7 @@
148148
{
149149
"drone_dimensions": [
150150
"device_type=none",
151-
"os=Mac-12|Mac-13",
151+
"os=Mac-13",
152152
"cpu=x86"
153153
],
154154
"gn": [
@@ -173,7 +173,7 @@
173173
{
174174
"drone_dimensions": [
175175
"device_type=none",
176-
"os=Mac-12|Mac-13",
176+
"os=Mac-13",
177177
"cpu=x86"
178178
],
179179
"gn": [
@@ -198,7 +198,7 @@
198198
{
199199
"drone_dimensions": [
200200
"device_type=none",
201-
"os=Mac-12|Mac-13",
201+
"os=Mac-13",
202202
"cpu=x86"
203203
],
204204
"gn": [
@@ -224,7 +224,7 @@
224224
{
225225
"drone_dimensions": [
226226
"device_type=none",
227-
"os=Mac-12|Mac-13",
227+
"os=Mac-13",
228228
"cpu=x86"
229229
],
230230
"gn": [

‎ci/builders/mac_unopt.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"drone_dimensions": [
1313
"device_type=none",
14-
"os=Mac-12|Mac-13",
14+
"os=Mac-13",
1515
"cpu=x86",
1616
"mac_model=Macmini8,1"
1717
],
@@ -71,7 +71,7 @@
7171
},
7272
"drone_dimensions": [
7373
"device_type=none",
74-
"os=Mac-12|Mac-13",
74+
"os=Mac-13",
7575
"cpu=x86"
7676
],
7777
"gclient_variables": {
@@ -128,7 +128,7 @@
128128
],
129129
"drone_dimensions": [
130130
"device_type=none",
131-
"os=Mac-12|Mac-13",
131+
"os=Mac-13",
132132
"cpu=arm64"
133133
],
134134
"gclient_variables": {
@@ -177,7 +177,7 @@
177177
},
178178
"drone_dimensions": [
179179
"device_type=none",
180-
"os=Mac-12|Mac-13",
180+
"os=Mac-13",
181181
"cpu=arm64"
182182
],
183183
"gclient_variables": {
@@ -247,7 +247,7 @@
247247
},
248248
"drone_dimensions": [
249249
"device_type=none",
250-
"os=Mac-12|Mac-13",
250+
"os=Mac-13",
251251
"cpu=arm64"
252252
],
253253
"gclient_variables": {

0 commit comments

Comments
 (0)