From 912ddccb66b3f5666e5109ca3329bfc4518b70b4 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 13 Dec 2023 14:01:14 -0600 Subject: [PATCH 1/2] Unpin mac_toolchain version --- .ci.yaml | 12 ++------ ci/builders/mac_android_aot_engine.json | 24 ++++----------- ci/builders/mac_host_engine.json | 24 ++++----------- ci/builders/mac_ios_engine.json | 40 +++++++------------------ ci/builders/mac_unopt.json | 20 ++++--------- 5 files changed, 30 insertions(+), 90 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index f4480ea050380..8d822f9cb65e1 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -35,9 +35,7 @@ platform_properties: # 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" @@ -369,9 +367,7 @@ targets: # 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 @@ -393,9 +389,7 @@ targets: # 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 diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 5704a2beb5413..962250d0de328 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } } diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index c00f8a515849c..8642c1b3e82db 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -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": [ @@ -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": [ @@ -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": [ @@ -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" } } }, @@ -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" } } }, @@ -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" } } } diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 67d43aaccc221..08cc3adf97dc8 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } }, @@ -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" } } } diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 74aec4ed47dec..ae72400e34ef2 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -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": [ @@ -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": [ @@ -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" } } }, @@ -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": [ @@ -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": [ From 875ae9a938d1a503eb97a0919fc4d6882d1ce590 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Thu, 14 Dec 2023 13:50:44 -0600 Subject: [PATCH 2/2] remove TODO comments --- .ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 8d822f9cb65e1..0f6e4f7893dd1 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -32,7 +32,6 @@ 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" @@ -364,7 +363,6 @@ 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" @@ -386,7 +384,6 @@ 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"