diff --git a/.ci.yaml b/.ci.yaml index b6b83d5019c1f..0f7e2a09767fc 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -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 diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 962250d0de328..5704a2beb5413 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -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" } } } diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 8642c1b3e82db..c00f8a515849c 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -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" } } } diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 08cc3adf97dc8..67d43aaccc221 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -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" } } } diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index ae72400e34ef2..74aec4ed47dec 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -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": [