firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use specific version of mac_toolchain (flutter/engine#47835)

Browse Source 
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.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
This commit is contained in:
Victoria Ashworth
2023-11-09 11:38:49 -06:00
committed by GitHub
parent 20430cf3e4
commit 5b6fce7cb9
5 changed files with 93 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
engine/src/flutter/.ci.yaml
View File

@@ -54,9 +54,12 @@ platform_properties:
device_type: none
cpu: x86
os: Mac-12|Mac-13
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
dimensions:
mac_model: "Macmini8,1|Macmini9,1"
@@ -447,9 +450,12 @@ targets:
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
drone_dimensions:
- os=Mac-12|Mac-13
@@ -468,9 +474,12 @@ targets:
add_recipes_cq: "true"
release_build: "true"
config_name: mac_ios_engine
# TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
$flutter/osx_sdk : >-
{
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
drone_dimensions:
- os=Mac-12|Mac-13

24
engine/src/flutter/ci/builders/mac_android_aot_engine.json
View File

@@ -35,7 +35,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -75,7 +77,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -115,7 +119,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -154,7 +160,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -194,7 +202,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -234,7 +244,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
}

24
engine/src/flutter/ci/builders/mac_host_engine.json
View File

@@ -47,7 +47,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"tests": [
@@ -106,7 +108,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"tests": [
@@ -176,7 +180,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"tests": [
@@ -237,7 +243,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -280,7 +288,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -325,7 +335,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
}

40
engine/src/flutter/ci/builders/mac_ios_engine.json
View File

@@ -19,7 +19,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -43,7 +45,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -67,7 +71,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -92,7 +98,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -117,7 +125,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -141,7 +151,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -166,7 +178,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -191,7 +205,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -217,7 +233,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -243,7 +261,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
}

20
engine/src/flutter/ci/builders/mac_unopt.json
View File

@@ -33,7 +33,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"tests": [
@@ -66,7 +68,9 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"drone_dimensions": [
@@ -152,7 +156,9 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
}
},
@@ -172,7 +178,9 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"drone_dimensions": [
@@ -242,7 +250,9 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c"
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
}
},
"drone_dimensions": [