Adds versioned xcode support
This CL does
1) cleans up doc following https://flutter-review.googlesource.com/c/infra/+/42061
2) stops `remove_runtime`
3) installs `runtime` to the same cache path `osx_sdk` to make it sharable across builds. (the old way has never worked as expected due to incorrect cache path config)
4) installs `runtime` one time and copies to destination dir one time
5) cleans cache only when specified (removing cache clean when runtime is required)
A series of LED validation is listed in the doc:
https://docs.google.com/document/d/1EcXm4Woq48GR_ky07mEJka6NfV1vFBN2OHDEeGfPk34/edit?resourcekey=0-0Gjtt1I66mGJ8AwiCTlFNw#heading=h.v9tje5e0dl78
This CL will cause fresh xcode installation on all bots. The good thing is this is a one-time change. I will send a PSA before landing.
Change-Id: Ibebb8047b6cdfae1799dae8cb936ce75ed9d4f75
Bug: https://github.com/flutter/flutter/issues/117541
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/42160
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/mac.json b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
index 3af1f55..5885cb1 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/mac.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
@@ -47,7 +47,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -91,14 +91,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -160,7 +160,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index 2125f0e..d1abca9 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -34,6 +34,7 @@
'Runtimes'
]
+_XCODE_CACHE_PATH = 'osx_sdk'
class OSXSDKApi(recipe_api.RecipeApi):
@@ -49,7 +50,9 @@
self._cleanup_cache = False
def _clean_cache(self):
- if self._cleanup_cache or self._runtime_versions:
+ # TODO(keyonghan): ideally we can cleanup a specific version of xcode cache.
+ # https://github.com/flutter/flutter/issues/117541
+ if self._cleanup_cache:
self.m.file.rmtree('Cleaning up Xcode cache', self.m.path['cache'].join('osx_sdk'))
def initialize(self):
@@ -95,53 +98,18 @@
caches: [
{
- # Cache for mac_toolchain tool and XCode.app
- name: "osx_sdk"
+ name: "flutter_xcode"
path: "osx_sdk"
- },
- {
- # Runtime version
- name: xcode_runtime_ios-14-0,
- path: xcode_runtime_ios-14-0
}
]
- If you have builders which e.g. use a non-current SDK, you can give them
- a uniqely named cache:
+ The Xcode app will be installed under:
+ osx_sdk/xcode_<xcode-version>
- caches: {
- # Cache for N-1 version mac_toolchain tool and XCode.app
- name: "osx_sdk_old"
- path: "osx_sdk"
- }
+ If any iOS runtime is needed, the corresponding path will be:
+ osx_sdk/xcode_<xcode-version>_runtime_<runtime-version>
- If you use multiple runtimes you'll need to provide a cache for each of
- the runtimes.
-
- caches: [
- {
- # Cache for mac_toolchain tool and XCode.app
- name: "osx_sdk"
- path: "osx_sdk"
- },
- {
- # Runtime version
- name: xcode_runtime_ios-14-0,
- path: xcode_runtime_ios-14-0
- },
- {
- # Runtime version
- name: xcode_runtime_ios-13-0,
- path: xcode_runtime_ios-13-0
- }
-
- ]
-
- Similarly, if you have mac and iOS builders you may want to distinguish the
- cache name by adding '_ios' to it. However, if you're sharing the same bots
- for both mac and iOS, consider having a single cache and just always
- fetching the iOS version. This will lead to lower overall disk utilization
- and should help to reduce cache thrashing.
+ These cached packages will be shared across builds/bots.
Usage:
with api.osx_sdk('mac'):
@@ -180,7 +148,12 @@
"""Ensures the mac_toolchain tool and OS X SDK packages are installed.
Returns Path to the installed sdk app bundle."""
- cache_dir = self.m.path['cache'].join('osx_sdk')
+ runtime_version = None
+ sdk_version = 'xcode_' + self._sdk_version
+ if self._runtime_versions:
+ runtime_version = "_".join(self._runtime_versions)
+ sdk_version = sdk_version + '_runtime_' + runtime_version
+ cache_dir = self.m.path['cache'].join(_XCODE_CACHE_PATH).join(sdk_version)
ef = self.m.cipd.EnsureFile()
ef.add_package(self._tool_pkg, self._tool_ver)
@@ -203,41 +176,35 @@
'-with-runtime=%s' % (not bool(self._runtime_versions))
],
)
+ # Skips runtime installation if it already exists. Otherwise,
+ # installs each runtime version under `osx_sdk` for cache sharing,
+ # and then copies over to the destination.
if self._runtime_versions:
- # Remove default runtime
- self.remove_runtime(sdk_app.join(*_RUNTIMESPATH).join('iOS.simruntime'))
- for version in self._runtime_versions:
- runtime_name = 'iOS %s.simruntime' % version.lower().replace('ios-', '').replace('-', '.')
- dest = sdk_app.join(*_RUNTIMESPATH).join(runtime_name)
- self.remove_runtime(dest)
-
self.m.file.ensure_directory('Ensuring runtimes directory', sdk_app.join(*_RUNTIMESPATH))
for version in self._runtime_versions:
- runtime_cache_dir = self.m.path['cache'].join('xcode_runtime_%s' % version.lower())
- self.m.step(
- 'install xcode runtime %s' % version.lower(),
- [
- cache_dir.join('mac_toolchain'),
- 'install-runtime',
- '-cipd-package-prefix',
- 'flutter_internal/ios/xcode',
- '-runtime-version',
- version.lower(),
- '-output-dir',
- runtime_cache_dir,
- ],
- )
- # Move the runtimes
runtime_name = 'iOS %s.simruntime' % version.lower().replace('ios-', '').replace('-', '.')
- path_with_version = runtime_cache_dir.join(runtime_name)
- # If the runtime was the default for xcode the cipd bundle contains a directory called iOS.simruntime otherwise
- # it contains a folder called "iOS <version>.simruntime".
- source = path_with_version if self.m.path.exists(path_with_version) else runtime_cache_dir.join('iOS.simruntime')
dest = sdk_app.join(*_RUNTIMESPATH).join(runtime_name)
- self.m.file.copytree('Copy runtime to %s' % dest, source, dest, symlinks=True)
+ if not self.m.path.exists(dest):
+ runtime_cache_dir = self.m.path['cache'].join(_XCODE_CACHE_PATH).join(
+ 'xcode_runtime_%s' % version.lower()
+ )
+ self.m.step(
+ 'install xcode runtime %s' % version.lower(),
+ [
+ cache_dir.join('mac_toolchain'),
+ 'install-runtime',
+ '-cipd-package-prefix',
+ 'flutter_internal/ios/xcode',
+ '-runtime-version',
+ version.lower(),
+ '-output-dir',
+ runtime_cache_dir,
+ ],
+ )
+ # Move the runtimes
+ path_with_version = runtime_cache_dir.join(runtime_name)
+ # If the runtime was the default for xcode the cipd bundle contains a directory called iOS.simruntime otherwise
+ # it contains a folder called "iOS <version>.simruntime".
+ source = path_with_version if self.m.path.exists(path_with_version) else runtime_cache_dir.join('iOS.simruntime')
+ self.m.file.copytree('Copy runtime to %s' % dest, source, dest, symlinks=True)
return sdk_app
-
- def remove_runtime(self, dest):
- is_symlink = self.m.os_utils.is_symlink(dest)
- msg = 'Removing %s' % dest
- self.m.file.remove(msg, dest) if is_symlink else self.m.file.rmtree(msg, dest)
diff --git a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
index 33a4e1c..1424d8e 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
@@ -4,7 +4,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9c40b",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -30,14 +30,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9c40b/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"9c40b",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9c40b/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -59,7 +59,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9c40b/XCode.app"
],
"infra_step": true,
"name": "select XCode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
index 455c07c..fccf182 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
@@ -4,7 +4,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_12a7209",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -30,14 +30,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_12a7209/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"12a7209",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -59,7 +59,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_12a7209/XCode.app"
],
"infra_step": true,
"name": "select XCode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
index edd3a8b..b7b0b9a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
@@ -1,23 +1,10 @@
[
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Cleaning up Xcode cache"
- },
- {
- "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} 123abc",
"-max-threads",
@@ -43,14 +30,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"deadbeef",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=False"
@@ -65,63 +52,24 @@
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes"
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes"
],
"infra_step": true,
"name": "Ensuring runtimes directory"
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install-runtime",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-runtime-version",
"ios-13-0",
"-output-dir",
- "[CACHE]/xcode_runtime_ios-13-0"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-13-0"
],
"infra_step": true,
"name": "install xcode runtime ios-13-0"
@@ -135,22 +83,22 @@
"/path/to/tmp/json",
"copytree",
"--symlinks",
- "[CACHE]/xcode_runtime_ios-13-0/iOS.simruntime",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-13-0/iOS.simruntime",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
],
"infra_step": true,
- "name": "Copy runtime to [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
+ "name": "Copy runtime to [CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install-runtime",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-runtime-version",
"ios-14-0",
"-output-dir",
- "[CACHE]/xcode_runtime_ios-14-0"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-14-0"
],
"infra_step": true,
"name": "install xcode runtime ios-14-0"
@@ -164,11 +112,11 @@
"/path/to/tmp/json",
"copytree",
"--symlinks",
- "[CACHE]/xcode_runtime_ios-14-0/iOS.simruntime",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-14-0/iOS.simruntime",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
],
"infra_step": true,
- "name": "Copy runtime to [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
+ "name": "Copy runtime to [CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
},
{
"cmd": [
@@ -184,7 +132,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app"
],
"infra_step": true,
"name": "select XCode"
@@ -224,19 +172,6 @@
"name": "reset XCode"
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Cleaning up Xcode cache (2)"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version_nosymlink.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version_nosymlink.json
index e470be6..b7b0b9a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version_nosymlink.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version_nosymlink.json
@@ -1,23 +1,10 @@
[
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Cleaning up Xcode cache"
- },
- {
- "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} 123abc",
"-max-threads",
@@ -43,14 +30,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"deadbeef",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=False"
@@ -65,63 +52,24 @@
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "remove",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "remove",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
- ],
- "infra_step": true,
- "name": "Removing [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes"
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes"
],
"infra_step": true,
"name": "Ensuring runtimes directory"
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install-runtime",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-runtime-version",
"ios-13-0",
"-output-dir",
- "[CACHE]/xcode_runtime_ios-13-0"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-13-0"
],
"infra_step": true,
"name": "install xcode runtime ios-13-0"
@@ -135,22 +83,22 @@
"/path/to/tmp/json",
"copytree",
"--symlinks",
- "[CACHE]/xcode_runtime_ios-13-0/iOS.simruntime",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-13-0/iOS.simruntime",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
],
"infra_step": true,
- "name": "Copy runtime to [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
+ "name": "Copy runtime to [CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 13.0.simruntime"
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/mac_toolchain",
"install-runtime",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-runtime-version",
"ios-14-0",
"-output-dir",
- "[CACHE]/xcode_runtime_ios-14-0"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-14-0"
],
"infra_step": true,
"name": "install xcode runtime ios-14-0"
@@ -164,11 +112,11 @@
"/path/to/tmp/json",
"copytree",
"--symlinks",
- "[CACHE]/xcode_runtime_ios-14-0/iOS.simruntime",
- "[CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
+ "[CACHE]/osx_sdk/xcode_runtime_ios-14-0/iOS.simruntime",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
],
"infra_step": true,
- "name": "Copy runtime to [CACHE]/osx_sdk/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
+ "name": "Copy runtime to [CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 14.0.simruntime"
},
{
"cmd": [
@@ -184,7 +132,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-13-0_ios-14-0/XCode.app"
],
"infra_step": true,
"name": "select XCode"
@@ -224,19 +172,6 @@
"name": "reset XCode"
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Cleaning up Xcode cache (2)"
- },
- {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
index 4885716..356c389 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
@@ -17,7 +17,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_deadbeef",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} 123abc",
"-max-threads",
@@ -43,14 +43,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"deadbeef",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -72,7 +72,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/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.json b/recipe_modules/osx_sdk/examples/full.expected/mac.json
index e64aeca..708d77e 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -4,7 +4,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -30,14 +30,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -59,7 +59,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"infra_step": true,
"name": "select XCode"
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 3475082..a331b4f 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -539,7 +539,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -598,14 +598,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -693,7 +693,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 44b4ed5..cabebc9 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -539,7 +539,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -598,14 +598,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -693,7 +693,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index a3e0676..7ef01c0 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -459,7 +459,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_deadbeef",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -517,14 +517,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"deadbeef",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -610,7 +610,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
diff --git a/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
index 6902552..5c4a01a 100644
--- a/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_flutter_main.json b/recipes/engine/engine.expected/mac_flutter_main.json
index 83a9b29..d95484f 100644
--- a/recipes/engine/engine.expected/mac_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
index 6902552..5c4a01a 100644
--- a/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
index 83a9b29..d95484f 100644
--- a/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
index 363841c..b28f187 100644
--- a/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_font_subset_prod_main.json
index bef5e13..73e91e3 100644
--- a/recipes/engine/engine.expected/mac_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
index ae21c99..7b02914 100644
--- a/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_font_subset_staging_main.json
index 192acd0..48320dd 100644
--- a/recipes/engine/engine.expected/mac_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
index dcf0d1c..b8a552e 100644
--- a/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
index 1ab2812..cef9931 100644
--- a/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index dcf0d1c..b8a552e 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
index 1ab2812..cef9931 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 9a9bd18..11dddf7 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
index 9c61b14..21c1512 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 6ead3b7..240aee8 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
index fc31370..6afe95f 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
index 9a9bd18..11dddf7 100644
--- a/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_no_lto_prod_main.json
index 9c61b14..21c1512 100644
--- a/recipes/engine/engine.expected/mac_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
index 6ead3b7..240aee8 100644
--- a/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_no_lto_staging_main.json
index fc31370..6afe95f 100644
--- a/recipes/engine/engine.expected/mac_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
index 363841c..b28f187 100644
--- a/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_prod_main.json b/recipes/engine/engine.expected/mac_prod_main.json
index bef5e13..73e91e3 100644
--- a/recipes/engine/engine.expected/mac_prod_main.json
+++ b/recipes/engine/engine.expected/mac_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_flutter_flutter-3.8-candidate.10.json
index 6902552..5c4a01a 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_flutter_main.json b/recipes/engine/engine.expected/mac_publish_cipd_flutter_main.json
index 83a9b29..d95484f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
index 6902552..5c4a01a 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_main.json
index 83a9b29..d95484f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
index 363841c..b28f187 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_main.json
index bef5e13..73e91e3 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
index ae21c99..7b02914 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_main.json
index 192acd0..48320dd 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
index dcf0d1c..b8a552e 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_main.json
index 1ab2812..cef9931 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index dcf0d1c..b8a552e 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_main.json
index 1ab2812..cef9931 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 9a9bd18..11dddf7 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_main.json
index 9c61b14..21c1512 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 6ead3b7..240aee8 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_main.json
index fc31370..6afe95f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
index 9a9bd18..11dddf7 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_main.json
index 9c61b14..21c1512 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
index 6ead3b7..240aee8 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_main.json
index fc31370..6afe95f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_prod_flutter-3.8-candidate.10.json
index 363841c..b28f187 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_prod_main.json b/recipes/engine/engine.expected/mac_publish_cipd_prod_main.json
index bef5e13..73e91e3 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_prod_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_publish_cipd_staging_flutter-3.8-candidate.10.json
index ae21c99..7b02914 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_staging_main.json b/recipes/engine/engine.expected/mac_publish_cipd_staging_main.json
index 192acd0..48320dd 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_staging_main.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
index ae21c99..7b02914 100644
--- a/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_staging_main.json b/recipes/engine/engine.expected/mac_staging_main.json
index 192acd0..48320dd 100644
--- a/recipes/engine/engine.expected/mac_staging_main.json
+++ b/recipes/engine/engine.expected/mac_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
index b6578d2..8c28608 100644
--- a/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_flutter_main.json b/recipes/engine/engine.expected/mac_upload_flutter_main.json
index 16f068f..12bc116 100644
--- a/recipes/engine/engine.expected/mac_upload_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
index b6578d2..8c28608 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
index 16f068f..12bc116 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
index 66319b3..aa8d1e4 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
index 87a959d..7ca7f0c 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
index 83659cd..c0e6365 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
index 9d488ca..959abac 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
index 9416370..bcbc507 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
index ecfd447..9aa4a15 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 9416370..bcbc507 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
index ecfd447..9aa4a15 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index ac25f71..435460e 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
index 8dadb0c..3e42d24 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index c1662ee..139c21f 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
index 00750b5..5cdbdac 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
index ac25f71..435460e 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
index 8dadb0c..3e42d24 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
index c1662ee..139c21f 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
index 00750b5..5cdbdac 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
index 66319b3..aa8d1e4 100644
--- a/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_prod_main.json b/recipes/engine/engine.expected/mac_upload_prod_main.json
index 87a959d..7ca7f0c 100644
--- a/recipes/engine/engine.expected/mac_upload_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_flutter-3.8-candidate.10.json
index b6578d2..8c28608 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_main.json
index 16f068f..12bc116 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
index b6578d2..8c28608 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_main.json
index 16f068f..12bc116 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
index 66319b3..aa8d1e4 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_main.json
index 87a959d..7ca7f0c 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
index 83659cd..c0e6365 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_main.json
index 9d488ca..959abac 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
index 9416370..bcbc507 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_main.json
index ecfd447..9aa4a15 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 9416370..bcbc507 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_main.json
index ecfd447..9aa4a15 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index ac25f71..435460e 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_main.json
index 8dadb0c..3e42d24 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index c1662ee..139c21f 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_main.json
index 00750b5..5cdbdac 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
index ac25f71..435460e 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_main.json
index 8dadb0c..3e42d24 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
index c1662ee..139c21f 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_main.json
index 00750b5..5cdbdac 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_flutter-3.8-candidate.10.json
index 66319b3..aa8d1e4 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_main.json
index 87a959d..7ca7f0c 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_flutter-3.8-candidate.10.json
index 83659cd..c0e6365 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_main.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_main.json
index 9d488ca..959abac 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
index 83659cd..c0e6365 100644
--- a/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine.expected/mac_upload_staging_main.json b/recipes/engine/engine.expected/mac_upload_staging_main.json
index 9d488ca..959abac 100644
--- a/recipes/engine/engine.expected/mac_upload_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_staging_main.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host all.json b/recipes/engine/engine_lint.expected/mac host all.json
index 3681997..160b0e9 100644
--- a/recipes/engine/engine_lint.expected/mac host all.json
+++ b/recipes/engine/engine_lint.expected/mac host all.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host branch.json b/recipes/engine/engine_lint.expected/mac host branch.json
index 3681997..160b0e9 100644
--- a/recipes/engine/engine_lint.expected/mac host branch.json
+++ b/recipes/engine/engine_lint.expected/mac host branch.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac host head.json b/recipes/engine/engine_lint.expected/mac host head.json
index 02d2b0e..983c7d5 100644
--- a/recipes/engine/engine_lint.expected/mac host head.json
+++ b/recipes/engine/engine_lint.expected/mac host head.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios all.json b/recipes/engine/engine_lint.expected/mac ios all.json
index 3681997..160b0e9 100644
--- a/recipes/engine/engine_lint.expected/mac ios all.json
+++ b/recipes/engine/engine_lint.expected/mac ios all.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios branch.json b/recipes/engine/engine_lint.expected/mac ios branch.json
index 3681997..160b0e9 100644
--- a/recipes/engine/engine_lint.expected/mac ios branch.json
+++ b/recipes/engine/engine_lint.expected/mac ios branch.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_lint.expected/mac ios head.json b/recipes/engine/engine_lint.expected/mac ios head.json
index 02d2b0e..983c7d5 100644
--- a/recipes/engine/engine_lint.expected/mac ios head.json
+++ b/recipes/engine/engine_lint.expected/mac ios head.json
@@ -371,7 +371,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -429,14 +429,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -522,7 +522,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_unopt.expected/mac.json b/recipes/engine/engine_unopt.expected/mac.json
index 78a9896..b850529 100644
--- a/recipes/engine/engine_unopt.expected/mac.json
+++ b/recipes/engine/engine_unopt.expected/mac.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine/engine_unopt.expected/mac_lto.json b/recipes/engine/engine_unopt.expected/mac_lto.json
index 78a9896..b850529 100644
--- a/recipes/engine/engine_unopt.expected/mac_lto.json
+++ b/recipes/engine/engine_unopt.expected/mac_lto.json
@@ -396,7 +396,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -454,14 +454,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -547,7 +547,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 0e3b51b..df35bd5 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -220,7 +220,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -258,14 +258,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -311,7 +311,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"infra_step": true,
"luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 46ac1d6..7194b7c 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -533,7 +533,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -572,14 +572,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -631,7 +631,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"infra_step": true,
"luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index 62c5a67..071b0a7 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -999,7 +999,7 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/osx_sdk",
+ "[CACHE]/osx_sdk/xcode_9f2000",
"-ensure-file",
"infra/tools/mac_toolchain/${platform} latest",
"-max-threads",
@@ -1038,14 +1038,14 @@
},
{
"cmd": [
- "[CACHE]/osx_sdk/mac_toolchain",
+ "[CACHE]/osx_sdk/xcode_9f2000/mac_toolchain",
"install",
"-kind",
"ios",
"-xcode-version",
"9f2000",
"-output-dir",
- "[CACHE]/osx_sdk/XCode.app",
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
"-cipd-package-prefix",
"flutter_internal/ios/xcode",
"-with-runtime=True"
@@ -1097,7 +1097,7 @@
"sudo",
"xcode-select",
"--switch",
- "[CACHE]/osx_sdk/XCode.app"
+ "[CACHE]/osx_sdk/xcode_9f2000/XCode.app"
],
"infra_step": true,
"luci_context": {
