Don't cache Xcode per runtime on macOS 13 Bug: https://github.com/flutter/flutter/issues/139771 Change-Id: I39c900dd00e877bac1b3a7eb6916f336b0b554b5 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/52982 Commit-Queue: Victoria Ashworth <vashworth@google.com> Reviewed-by: Ricardo Amador <ricardoamador@google.com>
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py index f5c6219..20c8658 100644 --- a/recipe_modules/osx_sdk/api.py +++ b/recipe_modules/osx_sdk/api.py
@@ -578,7 +578,7 @@ return '/opt/flutter/xcode/%s' % self._sdk_version runtime_version = None sdk_version = 'xcode_' + self._sdk_version - if self._runtime_versions: + if not self.macos_13_or_later and self._runtime_versions: runtime_version = "_".join(self._runtime_versions) sdk_version = sdk_version + '_runtime_' + runtime_version return self.m.path['cache'].join(_XCODE_CACHE_PATH).join(sdk_version)
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json index 40b120d..734b399 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json +++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
@@ -17,7 +17,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -46,7 +46,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -56,14 +56,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -88,7 +88,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json index 61a901c..065b50b 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json +++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
@@ -12,7 +12,7 @@ "cmd": [ "rm", "-rf", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "Cleaning up Xcode cache" @@ -26,7 +26,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -55,7 +55,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -65,14 +65,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -97,7 +97,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "Cleaning up runtimes cache.select xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json index 083c8bb..3dad70d 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json +++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
@@ -12,7 +12,7 @@ "cmd": [ "rm", "-rf", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "Cleaning up Xcode cache" @@ -26,7 +26,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -55,7 +55,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -65,14 +65,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -97,7 +97,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "Cleaning up runtimes cache.select xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json index c927ac8..6ba4bcf 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json +++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
@@ -17,7 +17,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -46,7 +46,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -56,14 +56,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -85,7 +85,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode", @@ -111,7 +111,7 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install-runtime-dmg", "-cipd-package-prefix", "infra_internal/ios/xcode", @@ -268,7 +268,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "select xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json index 616f51a..42266f8 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json +++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
@@ -17,7 +17,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -46,7 +46,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -56,14 +56,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -88,7 +88,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode", @@ -113,7 +113,7 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install-runtime-dmg", "-cipd-package-prefix", "infra_internal/ios/xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json index ac66241..695ab40 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json +++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
@@ -12,7 +12,7 @@ "cmd": [ "rm", "-rf", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "Cleaning up Xcode cache" @@ -26,7 +26,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -55,7 +55,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -65,14 +65,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -94,7 +94,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "Cleaning up runtimes cache.select xcode", @@ -174,7 +174,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode", @@ -198,7 +198,7 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install-runtime-dmg", "-cipd-package-prefix", "infra_internal/ios/xcode", @@ -316,7 +316,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "select xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json index 0b18af6..712e920 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json +++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
@@ -17,7 +17,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -46,7 +46,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -56,14 +56,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -88,7 +88,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode", @@ -113,7 +113,7 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install-runtime-dmg", "-cipd-package-prefix", "infra_internal/ios/xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json index 10b8d36..3265675 100644 --- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json +++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
@@ -17,7 +17,7 @@ "cipd", "ensure", "-root", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c", + "[CACHE]/osx_sdk/xcode_deadbeef", "-ensure-file", "infra/tools/mac_toolchain/${platform} 123abc", "-max-threads", @@ -46,7 +46,7 @@ "cmd": [ "ls", "-al", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c" + "[CACHE]/osx_sdk/xcode_deadbeef" ], "infra_step": true, "name": "install xcode.Show tool_dir cache", @@ -56,14 +56,14 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install", "-kind", "mac", "-xcode-version", "deadbeef", "-output-dir", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app", + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app", "-cipd-package-prefix", "infra_internal/ios/xcode", "-with-runtime=False", @@ -85,7 +85,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "install runtimes.select xcode", @@ -110,7 +110,7 @@ }, { "cmd": [ - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain", + "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain", "install-runtime-dmg", "-cipd-package-prefix", "infra_internal/ios/xcode", @@ -281,7 +281,7 @@ "sudo", "xcode-select", "--switch", - "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app" + "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app" ], "infra_step": true, "name": "select xcode"