Unverified Commit 46dcb32c authored by Victoria Ashworth's avatar Victoria Ashworth Committed by GitHub

Use specific version of mac_toolchain (#138115)

Newer versions of mac_toolchain increase Xcode install times by ~2 minutes (https://github.com/flutter/flutter/issues/138109). As a temporary solution, we're using an older version of mac_toolchain.
parent a408c6d9
...@@ -81,9 +81,12 @@ platform_properties: ...@@ -81,9 +81,12 @@ platform_properties:
] ]
os: Mac-12|Mac-13 os: Mac-12|Mac-13
device_type: none device_type: none
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_arm64: mac_arm64:
properties: properties:
...@@ -94,9 +97,12 @@ platform_properties: ...@@ -94,9 +97,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
device_type: none device_type: none
cpu: arm64 cpu: arm64
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_benchmark: mac_benchmark:
properties: properties:
...@@ -109,9 +115,12 @@ platform_properties: ...@@ -109,9 +115,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_x64: mac_x64:
properties: properties:
...@@ -122,9 +131,12 @@ platform_properties: ...@@ -122,9 +131,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
device_type: none device_type: none
cpu: x86 cpu: x86
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_build_test: mac_build_test:
properties: properties:
...@@ -136,9 +148,12 @@ platform_properties: ...@@ -136,9 +148,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
device_type: none device_type: none
cpu: x86 cpu: x86
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_android: mac_android:
properties: properties:
...@@ -171,9 +186,12 @@ platform_properties: ...@@ -171,9 +186,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
cpu: x86 cpu: x86
device_os: iOS-16 device_os: iOS-16
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
mac_arm64_ios: mac_arm64_ios:
properties: properties:
...@@ -185,9 +203,12 @@ platform_properties: ...@@ -185,9 +203,12 @@ platform_properties:
os: Mac-12|Mac-13 os: Mac-12|Mac-13
cpu: arm64 cpu: arm64
device_os: iOS-16 device_os: iOS-16
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14e300c" "sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
windows: windows:
properties: properties:
...@@ -3934,9 +3955,12 @@ targets: ...@@ -3934,9 +3955,12 @@ targets:
tags: > tags: >
["devicelab", "ios", "mac"] ["devicelab", "ios", "mac"]
task_name: flavors_test_ios_xcode_debug task_name: flavors_test_ios_xcode_debug
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14c18" "sdk_version": "14c18",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
bringup: true bringup: true
...@@ -3975,9 +3999,12 @@ targets: ...@@ -3975,9 +3999,12 @@ targets:
tags: > tags: >
["devicelab", "ios", "mac"] ["devicelab", "ios", "mac"]
task_name: flutter_gallery_ios__start_up_xcode_debug task_name: flutter_gallery_ios__start_up_xcode_debug
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14c18" "sdk_version": "14c18",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
bringup: true bringup: true
...@@ -4064,9 +4091,12 @@ targets: ...@@ -4064,9 +4091,12 @@ targets:
tags: > tags: >
["devicelab", "ios", "mac"] ["devicelab", "ios", "mac"]
task_name: integration_ui_ios_driver_xcode_debug task_name: integration_ui_ios_driver_xcode_debug
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14c18" "sdk_version": "14c18",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
bringup: true bringup: true
...@@ -4212,9 +4242,12 @@ targets: ...@@ -4212,9 +4242,12 @@ targets:
tags: > tags: >
["devicelab", "ios", "mac"] ["devicelab", "ios", "mac"]
task_name: microbenchmarks_ios_xcode_debug task_name: microbenchmarks_ios_xcode_debug
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >- $flutter/osx_sdk : >-
{ {
"sdk_version": "14c18" "sdk_version": "14c18",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
} }
bringup: true bringup: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment