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

Unpin mac_toolchain version #48994

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Unpin mac_toolchain version #48994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
912ddcc
Unpin mac_toolchain version
vashworth Dec 13, 2023
875ae9a
remove TODO comments
vashworth Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,9 @@ 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",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
dimensions:
mac_model: "Macmini8,1|Macmini9,1"
Expand Down Expand Up @@ -366,12 +363,9 @@ 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",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
drone_dimensions:
- os=Mac-12|Mac-13
Expand All @@ -390,12 +384,9 @@ 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",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
drone_dimensions:
- os=Mac-12|Mac-13
Expand Down
24 changes: 6 additions & 18 deletions ci/builders/mac_android_aot_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -77,9 +75,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -119,9 +115,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -160,9 +154,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -202,9 +194,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -244,9 +234,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
}
Expand Down
24 changes: 6 additions & 18 deletions ci/builders/mac_host_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"tests": [
Expand Down Expand Up @@ -108,9 +106,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"tests": [
Expand Down Expand Up @@ -180,9 +176,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"tests": [
Expand Down Expand Up @@ -243,9 +237,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -288,9 +280,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand Down Expand Up @@ -335,9 +325,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
}
Expand Down
40 changes: 10 additions & 30 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -45,9 +43,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -71,9 +67,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -98,9 +92,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -125,9 +117,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -151,9 +141,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -178,9 +166,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -205,9 +191,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -233,9 +217,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -261,9 +243,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
}
Expand Down
20 changes: 5 additions & 15 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"tests": [
Expand Down Expand Up @@ -68,9 +66,7 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
Expand Down Expand Up @@ -156,9 +152,7 @@
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
}
},
Expand All @@ -178,9 +172,7 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
Expand Down Expand Up @@ -250,9 +242,7 @@
"ios-16-4_14e300c",
"ios-16-2_14c18"
],
"sdk_version": "14e300c",
"toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
"toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
"sdk_version": "14e300c"
}
},
"drone_dimensions": [
Expand Down