Skip to content

Commit 46dcb32

Browse files
vashworthvashworth
authored
Use specific version of mac_toolchain (flutter#138115)
Newer versions of mac_toolchain increase Xcode install times by ~2 minutes (flutter#138109). As a temporary solution, we're using an older version of mac_toolchain.
1 parent a408c6d commit 46dcb32

File tree

1 file changed

+44
-11
lines changed

1 file changed

+44
-11
lines changed

‎.ci.yaml‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,12 @@ platform_properties:
8181
]
8282
os: Mac-12|Mac-13
8383
device_type: none
84+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
8485
$flutter/osx_sdk : >-
8586
{
86-
"sdk_version": "14e300c"
87+
"sdk_version": "14e300c",
88+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
89+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
8790
}
8891
mac_arm64:
8992
properties:
@@ -94,9 +97,12 @@ platform_properties:
9497
os: Mac-12|Mac-13
9598
device_type: none
9699
cpu: arm64
100+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
97101
$flutter/osx_sdk : >-
98102
{
99-
"sdk_version": "14e300c"
103+
"sdk_version": "14e300c",
104+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
105+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
100106
}
101107
mac_benchmark:
102108
properties:
@@ -109,9 +115,12 @@ platform_properties:
109115
os: Mac-12|Mac-13
110116
tags: >
111117
["devicelab", "hostonly", "mac"]
118+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
112119
$flutter/osx_sdk : >-
113120
{
114-
"sdk_version": "14e300c"
121+
"sdk_version": "14e300c",
122+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
123+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
115124
}
116125
mac_x64:
117126
properties:
@@ -122,9 +131,12 @@ platform_properties:
122131
os: Mac-12|Mac-13
123132
device_type: none
124133
cpu: x86
134+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
125135
$flutter/osx_sdk : >-
126136
{
127-
"sdk_version": "14e300c"
137+
"sdk_version": "14e300c",
138+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
139+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
128140
}
129141
mac_build_test:
130142
properties:
@@ -136,9 +148,12 @@ platform_properties:
136148
os: Mac-12|Mac-13
137149
device_type: none
138150
cpu: x86
151+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
139152
$flutter/osx_sdk : >-
140153
{
141-
"sdk_version": "14e300c"
154+
"sdk_version": "14e300c",
155+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
156+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
142157
}
143158
mac_android:
144159
properties:
@@ -171,9 +186,12 @@ platform_properties:
171186
os: Mac-12|Mac-13
172187
cpu: x86
173188
device_os: iOS-16
189+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
174190
$flutter/osx_sdk : >-
175191
{
176-
"sdk_version": "14e300c"
192+
"sdk_version": "14e300c",
193+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
194+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
177195
}
178196
mac_arm64_ios:
179197
properties:
@@ -185,9 +203,12 @@ platform_properties:
185203
os: Mac-12|Mac-13
186204
cpu: arm64
187205
device_os: iOS-16
206+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
188207
$flutter/osx_sdk : >-
189208
{
190-
"sdk_version": "14e300c"
209+
"sdk_version": "14e300c",
210+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
211+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
191212
}
192213
windows:
193214
properties:
@@ -3934,9 +3955,12 @@ targets:
39343955
tags: >
39353956
["devicelab", "ios", "mac"]
39363957
task_name: flavors_test_ios_xcode_debug
3958+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
39373959
$flutter/osx_sdk : >-
39383960
{
3939-
"sdk_version": "14c18"
3961+
"sdk_version": "14c18",
3962+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
3963+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
39403964
}
39413965
bringup: true
39423966

@@ -3975,9 +3999,12 @@ targets:
39753999
tags: >
39764000
["devicelab", "ios", "mac"]
39774001
task_name: flutter_gallery_ios__start_up_xcode_debug
4002+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
39784003
$flutter/osx_sdk : >-
39794004
{
3980-
"sdk_version": "14c18"
4005+
"sdk_version": "14c18",
4006+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
4007+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
39814008
}
39824009
bringup: true
39834010

@@ -4064,9 +4091,12 @@ targets:
40644091
tags: >
40654092
["devicelab", "ios", "mac"]
40664093
task_name: integration_ui_ios_driver_xcode_debug
4094+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
40674095
$flutter/osx_sdk : >-
40684096
{
4069-
"sdk_version": "14c18"
4097+
"sdk_version": "14c18",
4098+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
4099+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
40704100
}
40714101
bringup: true
40724102

@@ -4212,9 +4242,12 @@ targets:
42124242
tags: >
42134243
["devicelab", "ios", "mac"]
42144244
task_name: microbenchmarks_ios_xcode_debug
4245+
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
42154246
$flutter/osx_sdk : >-
42164247
{
4217-
"sdk_version": "14c18"
4248+
"sdk_version": "14c18",
4249+
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
4250+
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
42184251
}
42194252
bringup: true
42204253

0 commit comments

Comments
 (0)