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

Commit fdae5f5

Browse files
vashworthvashworth
authored
Unpin mac_toolchain version (#48994)
mac_toolchain has been updated to no longer have 2 minute slowdown (flutter/flutter#138109), so unpin to use the latest version. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent d0464cf commit fdae5f5

File tree

5 files changed

+30
-93
lines changed

5 files changed

+30
-93
lines changed

‎.ci.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@ platform_properties:
3232
device_type: none
3333
cpu: x86
3434
os: Mac-12|Mac-13
35-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
3635
$flutter/osx_sdk : >-
3736
{
38-
"sdk_version": "14e300c",
39-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
40-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
37+
"sdk_version": "14e300c"
4138
}
4239
dimensions:
4340
mac_model: "Macmini8,1|Macmini9,1"
@@ -366,12 +363,9 @@ targets:
366363
[
367364
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
368365
]
369-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
370366
$flutter/osx_sdk : >-
371367
{
372-
"sdk_version": "14e300c",
373-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
374-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
368+
"sdk_version": "14e300c"
375369
}
376370
drone_dimensions:
377371
- os=Mac-12|Mac-13
@@ -390,12 +384,9 @@ targets:
390384
add_recipes_cq: "true"
391385
release_build: "true"
392386
config_name: mac_ios_engine
393-
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
394387
$flutter/osx_sdk : >-
395388
{
396-
"sdk_version": "14e300c",
397-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
398-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
389+
"sdk_version": "14e300c"
399390
}
400391
drone_dimensions:
401392
- os=Mac-12|Mac-13

‎ci/builders/mac_android_aot_engine.json

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
},
3636
"properties": {
3737
"$flutter/osx_sdk": {
38-
"sdk_version": "14e300c",
39-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
40-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
38+
"sdk_version": "14e300c"
4139
}
4240
}
4341
},
@@ -77,9 +75,7 @@
7775
},
7876
"properties": {
7977
"$flutter/osx_sdk": {
80-
"sdk_version": "14e300c",
81-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
82-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
78+
"sdk_version": "14e300c"
8379
}
8480
}
8581
},
@@ -119,9 +115,7 @@
119115
},
120116
"properties": {
121117
"$flutter/osx_sdk": {
122-
"sdk_version": "14e300c",
123-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
124-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
118+
"sdk_version": "14e300c"
125119
}
126120
}
127121
},
@@ -160,9 +154,7 @@
160154
},
161155
"properties": {
162156
"$flutter/osx_sdk": {
163-
"sdk_version": "14e300c",
164-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
165-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
157+
"sdk_version": "14e300c"
166158
}
167159
}
168160
},
@@ -202,9 +194,7 @@
202194
},
203195
"properties": {
204196
"$flutter/osx_sdk": {
205-
"sdk_version": "14e300c",
206-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
207-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
197+
"sdk_version": "14e300c"
208198
}
209199
}
210200
},
@@ -244,9 +234,7 @@
244234
},
245235
"properties": {
246236
"$flutter/osx_sdk": {
247-
"sdk_version": "14e300c",
248-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
249-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
237+
"sdk_version": "14e300c"
250238
}
251239
}
252240
}

‎ci/builders/mac_host_engine.json

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
},
4848
"properties": {
4949
"$flutter/osx_sdk": {
50-
"sdk_version": "14e300c",
51-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
52-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
50+
"sdk_version": "14e300c"
5351
}
5452
},
5553
"tests": [
@@ -108,9 +106,7 @@
108106
},
109107
"properties": {
110108
"$flutter/osx_sdk": {
111-
"sdk_version": "14e300c",
112-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
113-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
109+
"sdk_version": "14e300c"
114110
}
115111
},
116112
"tests": [
@@ -180,9 +176,7 @@
180176
},
181177
"properties": {
182178
"$flutter/osx_sdk": {
183-
"sdk_version": "14e300c",
184-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
185-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
179+
"sdk_version": "14e300c"
186180
}
187181
},
188182
"tests": [
@@ -243,9 +237,7 @@
243237
},
244238
"properties": {
245239
"$flutter/osx_sdk": {
246-
"sdk_version": "14e300c",
247-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
248-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
240+
"sdk_version": "14e300c"
249241
}
250242
}
251243
},
@@ -288,9 +280,7 @@
288280
},
289281
"properties": {
290282
"$flutter/osx_sdk": {
291-
"sdk_version": "14e300c",
292-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
293-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
283+
"sdk_version": "14e300c"
294284
}
295285
}
296286
},
@@ -335,9 +325,7 @@
335325
},
336326
"properties": {
337327
"$flutter/osx_sdk": {
338-
"sdk_version": "14e300c",
339-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
340-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
328+
"sdk_version": "14e300c"
341329
}
342330
}
343331
}

‎ci/builders/mac_ios_engine.json

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
},
2020
"properties": {
2121
"$flutter/osx_sdk": {
22-
"sdk_version": "14e300c",
23-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
24-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
22+
"sdk_version": "14e300c"
2523
}
2624
}
2725
},
@@ -45,9 +43,7 @@
4543
},
4644
"properties": {
4745
"$flutter/osx_sdk": {
48-
"sdk_version": "14e300c",
49-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
50-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
46+
"sdk_version": "14e300c"
5147
}
5248
}
5349
},
@@ -71,9 +67,7 @@
7167
},
7268
"properties": {
7369
"$flutter/osx_sdk": {
74-
"sdk_version": "14e300c",
75-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
76-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
70+
"sdk_version": "14e300c"
7771
}
7872
}
7973
},
@@ -98,9 +92,7 @@
9892
},
9993
"properties": {
10094
"$flutter/osx_sdk": {
101-
"sdk_version": "14e300c",
102-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
103-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
95+
"sdk_version": "14e300c"
10496
}
10597
}
10698
},
@@ -125,9 +117,7 @@
125117
},
126118
"properties": {
127119
"$flutter/osx_sdk": {
128-
"sdk_version": "14e300c",
129-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
130-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
120+
"sdk_version": "14e300c"
131121
}
132122
}
133123
},
@@ -151,9 +141,7 @@
151141
},
152142
"properties": {
153143
"$flutter/osx_sdk": {
154-
"sdk_version": "14e300c",
155-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
156-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
144+
"sdk_version": "14e300c"
157145
}
158146
}
159147
},
@@ -178,9 +166,7 @@
178166
},
179167
"properties": {
180168
"$flutter/osx_sdk": {
181-
"sdk_version": "14e300c",
182-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
183-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
169+
"sdk_version": "14e300c"
184170
}
185171
}
186172
},
@@ -205,9 +191,7 @@
205191
},
206192
"properties": {
207193
"$flutter/osx_sdk": {
208-
"sdk_version": "14e300c",
209-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
210-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
194+
"sdk_version": "14e300c"
211195
}
212196
}
213197
},
@@ -233,9 +217,7 @@
233217
},
234218
"properties": {
235219
"$flutter/osx_sdk": {
236-
"sdk_version": "14e300c",
237-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
238-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
220+
"sdk_version": "14e300c"
239221
}
240222
}
241223
},
@@ -261,9 +243,7 @@
261243
},
262244
"properties": {
263245
"$flutter/osx_sdk": {
264-
"sdk_version": "14e300c",
265-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
266-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
246+
"sdk_version": "14e300c"
267247
}
268248
}
269249
}

‎ci/builders/mac_unopt.json

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
},
3434
"properties": {
3535
"$flutter/osx_sdk": {
36-
"sdk_version": "14e300c",
37-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
38-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
36+
"sdk_version": "14e300c"
3937
}
4038
},
4139
"tests": [
@@ -68,9 +66,7 @@
6866
"ios-16-4_14e300c",
6967
"ios-16-2_14c18"
7068
],
71-
"sdk_version": "14e300c",
72-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
73-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
69+
"sdk_version": "14e300c"
7470
}
7571
},
7672
"drone_dimensions": [
@@ -156,9 +152,7 @@
156152
},
157153
"properties": {
158154
"$flutter/osx_sdk": {
159-
"sdk_version": "14e300c",
160-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
161-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
155+
"sdk_version": "14e300c"
162156
}
163157
}
164158
},
@@ -178,9 +172,7 @@
178172
"ios-16-4_14e300c",
179173
"ios-16-2_14c18"
180174
],
181-
"sdk_version": "14e300c",
182-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
183-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
175+
"sdk_version": "14e300c"
184176
}
185177
},
186178
"drone_dimensions": [
@@ -250,9 +242,7 @@
250242
"ios-16-4_14e300c",
251243
"ios-16-2_14c18"
252244
],
253-
"sdk_version": "14e300c",
254-
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
255-
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
245+
"sdk_version": "14e300c"
256246
}
257247
},
258248
"drone_dimensions": [

0 commit comments

Comments
 (0)