Modify paths for cache depending on env (devicelab or not) since the cache is at two different spots in each environment.
This change can land after this one: https://flutter-review.googlesource.com/c/recipes/+/54001
Bug: https://github.com/flutter/flutter/issues/141398
Change-Id: I1145bd054cbb9577dc84afc36dc79e5de85ff89e
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/54000
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Victoria Ashworth <vashworth@google.com>
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index ea4f52f..91fdbae 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -837,15 +837,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -859,7 +850,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -880,7 +871,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -1004,7 +995,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -1025,7 +1016,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -1113,15 +1104,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -1145,18 +1127,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -1166,10 +1148,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -1290,18 +1272,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -1311,10 +1293,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
index 274b665..99a141d 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
@@ -837,15 +837,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -859,7 +850,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -880,7 +871,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -1004,7 +995,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -1025,7 +1016,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -1113,15 +1104,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -1145,18 +1127,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -1166,10 +1148,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -1290,18 +1272,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -1311,10 +1293,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index fc6ad6c..14084aa 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -27,8 +27,6 @@
'Developer', 'CoreSimulator', 'Profiles', 'Runtimes'
]
-_XCODE_CACHE_PATH = 'osx_sdk'
-
# This CIPD source contains Xcode and iOS runtimes create and maintained by the
# Flutter team.
_FLUTTER_XCODE_CIPD = 'flutter_internal/ios/xcode'
@@ -155,7 +153,6 @@
try:
with self.m.context(infra_steps=True):
- self._show_xcode_cache()
self._setup_osx_sdk(kind, devicelab)
runtime_simulators = self.m.step(
'list runtimes', ['xcrun', 'simctl', 'list', 'runtimes'],
@@ -200,10 +197,21 @@
return not runtime_simulators
return len(self._runtime_versions) != len(runtime_simulators)
+ def _get_xcode_base_cache_path(self, devicelab: bool):
+ """Returns the base cache path for xcode.
+
+ Args:
+ devicelab - Whether or not the machine this code is running is a devicelab
+ machine.
+ """
+ if devicelab:
+ return '/opt/flutter/xcode'
+ return self.m.path['cache'].join('osx_sdk')
+
def _setup_osx_sdk(self, kind, devicelab):
app = None
self._clean_xcode_cache(devicelab)
- self._micro_manage_cache(devicelab)
+ self._micro_manage_cache(devicelab=devicelab)
app = self._ensure_sdk(kind, devicelab)
self.m.os_utils.kill_simulators()
self._select_xcode(app)
@@ -239,11 +247,11 @@
self.m.step('select xcode', ['sudo', 'xcode-select', '--switch', sdk_app])
def _verify_xcode(self, sdk_app):
- '''If Xcode is already downloaded, verify that it's not damaged.
+ """If Xcode is already downloaded, verify that it's not damaged.
Args:
sdk_app: (Path) Path to installed Xcode app bundle.
- '''
+ """
if not self.m.path.exists(sdk_app):
return
@@ -273,9 +281,9 @@
self._diagnose_codesign_failure(sdk_app)
def _diagnose_codesign_failure(self, sdk_app):
- '''Check if Xcode verification may have failed due to code not matching
+ """Check if Xcode verification may have failed due to code not matching
original signed code. Used to help debug issues.
- '''
+ """
self.m.step(
'verify codesign',
[
@@ -287,10 +295,10 @@
)
def _dimiss_damaged_notification(self):
- '''If Xcode is damaged, it may show a notification that can cause
+ """If Xcode is damaged, it may show a notification that can cause
Xcode processes to hang until it's closed. Kill `CoreServicesUIAgent`
to close it.
- '''
+ """
self.m.step(
'dismiss damaged notification',
['killall', '-9', 'CoreServicesUIAgent'],
@@ -356,9 +364,16 @@
self.m.step(
'install xcode from cipd',
[
- tool_dir.join('mac_toolchain'), 'install', '-kind', kind,
- '-xcode-version', self._sdk_version, '-output-dir', install_path,
- '-cipd-package-prefix', self._xcode_cipd_package_source,
+ tool_dir.join('mac_toolchain'),
+ 'install',
+ '-kind',
+ kind,
+ '-xcode-version',
+ self._sdk_version,
+ '-output-dir',
+ install_path,
+ '-cipd-package-prefix',
+ self._xcode_cipd_package_source,
'-with-runtime=%s' % (not bool(self._runtime_versions)),
'-verbose',
],
@@ -413,23 +428,25 @@
self._install_runtimes(devicelab, app_dir, tool_dir, sdk_app, kind)
return sdk_app
-
+
def _micro_manage_cache(self, devicelab):
+ cache_path = self._get_xcode_base_cache_path(devicelab)
app_dir = self._xcode_dir(devicelab)
self.m.step("show app_dir", ['echo', app_dir])
- self._show_xcode_cache()
- self.m.cache_micro_manager.run(self.m.path['cache'].join(_XCODE_CACHE_PATH), [app_dir])
- self._show_xcode_cache()
+ self._show_xcode_cache(devicelab=devicelab)
+ self.m.cache_micro_manager.run(cache_path, [app_dir])
+ self._show_xcode_cache(devicelab=devicelab)
- def _show_xcode_cache(self):
+ def _show_xcode_cache(self, devicelab):
+ cache_path = self._get_xcode_base_cache_path(devicelab)
self.m.step(
'Show xcode cache',
- ['ls', '-al', self.m.path['cache'].join(_XCODE_CACHE_PATH)],
+ ['ls', '-al', cache_path],
ok_ret='any',
)
def _install_runtimes(self, devicelab, app_dir, tool_dir, sdk_app, kind):
- '''Ensure runtimes are installed.
+ """Ensure runtimes are installed.
For macOS lower than 13, this involves downloading the runtime and copying
it into the Xcode app bundle.
@@ -446,7 +463,8 @@
tool_dir: (Path) Path to mac_toolchain cache directory.
sdk_app: (Path) Path to installed Xcode app bundle.
kind ('mac'|'ios'): How the SDK should be configured.
- '''
+ """
+
if not self._runtime_versions:
# On macOS 13, when cleanup_cache is True, we first clear the Xcode cache,
# install Xcode, and then clean up the runtimes cache. It happens in this
@@ -480,6 +498,7 @@
)
runtime_version = runtime_version_parts[0]
xcode_version = runtime_version_parts[1]
+ # we can assume devicelab False and build this with base path.
runtime_dmg_cache_dir = self._runtime_dmg_dir_cache_path(version)
self.m.step(
@@ -542,11 +561,10 @@
).replace('ios-', '').replace('-', '.')
dest = self.m.path.join(sdk_app, *_RUNTIMESPATH, runtime_name)
if not self.m.path.exists(dest):
- runtime_cache_dir = self.m.path['cache'].join(_XCODE_CACHE_PATH
- ).join(
- 'xcode_runtime_%s'
- % version.lower()
- )
+ cache_base_path = self._get_xcode_base_cache_path(False)
+ runtime_cache_dir = cache_base_path.join(
+ 'xcode_runtime_%s' % version.lower()
+ )
self.m.step(
'install xcode runtime %s' % version.lower(),
[
@@ -572,7 +590,7 @@
)
def _xcode_dir(self, devicelab):
- """Returns xcode cache dir.
+ """Returns the location of the xcode app in the cache dir.
For a devicelab task, the path is prefixed at `/opt/flutter/xcode`.
@@ -582,25 +600,27 @@
a host only task with runtimes, the path looks like
xcode_<xcode-version>_runtime1_<runtime1-version>_..._runtimeN_<runtimeN-version>
"""
+
+ xcode_cache_base_path = self._get_xcode_base_cache_path(devicelab)
if devicelab:
- return '/opt/flutter/xcode/%s' % self._sdk_version
+ return f"{xcode_cache_base_path}/{self._sdk_version}"
runtime_version = None
- sdk_version = 'xcode_' + self._sdk_version
+ sdk_version = f"xcode_{self._sdk_version}"
if not self.macos_13_or_later and self._runtime_versions:
runtime_version = "_".join(self._runtime_versions)
- sdk_version = sdk_version + '_runtime_' + runtime_version
- return self.m.path['cache'].join(_XCODE_CACHE_PATH).join(sdk_version)
+ sdk_version = f"{sdk_version}_runtime_{runtime_version}"
+ return xcode_cache_base_path.join(sdk_version)
def _runtime_dmg_dir_cache_path(self, version):
- return self.m.path['cache'].join(_XCODE_CACHE_PATH).join(
- 'xcode_runtime_dmg_%s' % version.lower()
- )
+ cache_base_path = self._get_xcode_base_cache_path(False)
+ # this method seems to be only used for non-devicelab cache path.
+ return cache_base_path.join('xcode_runtime_dmg_%s' % version.lower())
def _cleanup_runtimes_cache(self, sdk_app):
- '''Deletes all mounted runtimes and deletes corresponding cached runtime dmgs.
+ """Deletes all mounted runtimes and deletes corresponding cached runtime dmgs.
This is only used for macOS 13+ since runtimes are installed and mounted separately.
- '''
+ """
if not self._cleanup_cache or not self.macos_13_or_later:
return
@@ -660,9 +680,9 @@
# pylint: disable=unused-argument
def _is_runtimes_unmounted(self, timeout=None):
- '''Check if more than one runtime is currently mounted. If more than one
+ """Check if more than one runtime is currently mounted. If more than one
is mounted, raise a `StepFailure`.
- '''
+ """
runtime_simulators = self.m.step(
'list runtimes', ['xcrun', 'simctl', 'list', 'runtimes'],
stdout=self.m.raw_io.output_text(add_output_log=True)
@@ -677,7 +697,7 @@
def _is_runtime_mounted(
self, runtime_version, xcode_version, runtime_simulators
):
- '''Determine if iOS runtime version is already mounted.
+ """Determine if iOS runtime version is already mounted.
Args:
runtime_version: (string) The iOS version (e.g. "ios-16-4").
@@ -685,7 +705,7 @@
runtime_simulators: (list) A list of strings of runtime versions.
Returns:
A boolean for whether or not the runtime is already mounted.
- '''
+ """
with self.m.step.nest('cipd describe %s_%s' %
(runtime_version, xcode_version)) as display_step:
@@ -720,7 +740,7 @@
return False
def _get_ios_runtime_build_version(self, runtime_version, xcode_version=None):
- '''Gets the iOS runtime build version from CIPD.
+ """Gets the iOS runtime build version from CIPD.
If `xcode_version` is provided, it will use it to search for the CIPD package.
If not provided, the `runtime_version` will be used. In both cases, it ensures
@@ -731,7 +751,7 @@
xcode_version: (string) A version of Xcode to use to find CIPD package (e.g. "14e300c").
Returns:
A string of the build version or None if unable to get the build version.
- '''
+ """
search_ref = runtime_version
if xcode_version is not None:
@@ -765,14 +785,14 @@
return None
def _parse_cipd_description_tag(self, tag):
- '''Parse a colon separated CIPD description tag.
+ """Parse a colon separated CIPD description tag.
Args:
tag: (string) A colon separated string describing a CIPD tag.
(e.g "ios_runtime_build:21A5303d" or "ios_runtime_version:ios-17-0")
Returns:
A string of the value following the colon or None if unable to parse.
- '''
+ """
tag_parts = tag.split(':')
if len(tag_parts) == 2:
return tag_parts[1]
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 2cc1a58..1094b8f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9c40b"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -168,7 +159,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -189,7 +180,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -302,15 +293,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -334,18 +316,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -355,10 +337,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -479,18 +461,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -500,10 +482,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
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 ea8cd06..8e1d86f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_12a7209"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -168,7 +159,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -189,7 +180,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -302,15 +293,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -334,18 +316,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -355,10 +337,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -479,18 +461,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -500,10 +482,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
index 35a730c..383cd1b 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
index 6bbf104..d56ac09 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -36,7 +27,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -57,7 +48,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -181,7 +172,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -202,7 +193,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -315,15 +306,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -347,18 +329,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -368,10 +350,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -492,18 +474,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -513,10 +495,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
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 7bd8375..daae63a 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,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-14-0_ios-13-0"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -259,15 +250,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (4)"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -278,40 +260,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (6)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -432,40 +405,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
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 1fec398..ed5df89 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -36,7 +27,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -57,7 +48,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -181,7 +172,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -202,7 +193,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -315,15 +306,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -347,18 +329,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -368,10 +350,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -492,18 +474,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -513,10 +495,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
index 7603a27..965a93a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"rm",
"-rf",
"[CACHE]/osx_sdk/xcode_deadbeef"
@@ -32,7 +23,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
index aa6582f..92aa58a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"rm",
"-rf",
"[CACHE]/osx_sdk/xcode_deadbeef"
@@ -32,7 +23,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipe_modules/osx_sdk/examples/full.expected/mac.json
index d387335..cb0d248 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -168,7 +159,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -189,7 +180,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -302,15 +293,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -334,18 +316,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -355,10 +337,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -479,18 +461,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -500,10 +482,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
index 482fbd8..0d4a3c5 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -176,7 +167,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -197,7 +188,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -443,15 +434,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -475,18 +457,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -496,10 +478,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -753,18 +735,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -774,10 +756,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
index f699ab2..3933408 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"rm",
"-rf",
"[CACHE]/osx_sdk/xcode_deadbeef"
@@ -32,7 +23,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -306,7 +297,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -327,7 +318,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -573,15 +564,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -605,18 +587,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -626,10 +608,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -883,18 +865,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -904,10 +886,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
index a28c02a..4907d28 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -357,15 +348,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (4)"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -376,18 +358,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -397,10 +379,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (6)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -533,18 +515,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -554,10 +536,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
index c39e079..1494ee8 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
index f6f707c..5821c0f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"rm",
"-rf",
"[CACHE]/osx_sdk/xcode_deadbeef"
@@ -32,7 +23,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -405,15 +396,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (4)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -437,18 +419,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -458,10 +440,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (6)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -656,18 +638,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -677,10 +659,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
index 9a9e24e..39addcd 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
index 54fc072..0573671 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -370,15 +361,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (4)"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -389,18 +371,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -410,10 +392,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (6)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -546,18 +528,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -567,10 +549,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
index 75389af..73b5db1 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -44,7 +35,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -176,7 +167,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -197,7 +188,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -443,15 +434,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -475,18 +457,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -496,10 +478,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -753,18 +735,18 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Cache Micro Manager, cache directory exists check",
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
@@ -774,10 +756,10 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
index 8db4a14..570fbed 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -234,7 +225,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -264,7 +255,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -377,15 +368,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -409,40 +391,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -563,40 +536,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
index a97fc2c..09b6c21 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
@@ -1,15 +1,6 @@
[
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -23,7 +14,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -53,7 +44,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -606,7 +597,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -636,7 +627,7 @@
"[CACHE]/osx_sdk"
],
"infra_step": true,
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
@@ -996,15 +987,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Show xcode cache (6)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -1028,40 +1010,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (7)"
+ "name": "Show xcode cache (5)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (3).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (8)"
+ "name": "Show xcode cache (6)"
},
{
"cmd": [],
@@ -1315,40 +1288,31 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (9)"
+ "name": "Show xcode cache (7)"
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4)"
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (4).Reading cache directory [CACHE]/osx_sdk",
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@listdir@@@"
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
]
},
{
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
],
"infra_step": true,
- "name": "Show xcode cache (10)"
+ "name": "Show xcode cache (8)"
},
{
"cmd": [],
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index a0eed48..b939d5d 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -583,49 +583,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -707,7 +664,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -762,7 +719,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -1192,7 +1149,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -1247,7 +1204,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 828ee1c..7d48873 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -583,49 +583,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -707,7 +664,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -762,7 +719,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -1192,7 +1149,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -1247,7 +1204,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
index cde71fc..f21cf56 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -583,49 +583,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -670,7 +627,62 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "False"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -711,61 +723,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (3)"
- },
- {
- "cmd": [],
"name": "install xcode"
},
{
@@ -1155,7 +1112,62 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "False"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -1196,61 +1208,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (5)"
- },
- {
- "cmd": [],
"name": "install xcode (2)"
},
{
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 2ccf6be..c573b6a 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -583,49 +583,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -670,7 +627,62 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "False"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -711,61 +723,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (3)"
- },
- {
- "cmd": [],
"name": "install xcode"
},
{
@@ -1155,7 +1112,62 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "False"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -1196,61 +1208,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "False"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (5)"
- },
- {
- "cmd": [],
"name": "install xcode (2)"
},
{
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 de89b4b..1c76f42 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -500,48 +500,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_deadbeef"
],
@@ -621,7 +579,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -675,7 +633,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -1096,7 +1054,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -1150,7 +1108,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
diff --git a/recipes/devicelab/devicelab_test_drone.expected/mac.json b/recipes/devicelab/devicelab_test_drone.expected/mac.json
index 87d718c..2379737 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/mac.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/mac.json
@@ -607,48 +607,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"/opt/flutter/xcode/deadbeef"
],
@@ -692,7 +650,61 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -732,60 +744,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (3)"
- },
- {
- "cmd": [],
"name": "install xcode"
},
{
@@ -1167,7 +1125,61 @@
"cmd": [
"ls",
"-al",
- "[CACHE]/osx_sdk"
+ "/opt/flutter/xcode"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on /opt/flutter/xcode. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "/opt/flutter/xcode"
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
@@ -1207,60 +1219,6 @@
},
{
"cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
- },
- {
- "cmd": [],
- "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
- ]
- },
- {
- "cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
- "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
- "GIT_BRANCH": "master",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "darwin",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache (5)"
- },
- {
- "cmd": [],
"name": "install xcode (2)"
},
{
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index cd706f2..30db586 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -471,27 +471,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Show xcode cache"
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -529,7 +508,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (2)"
+ "name": "Show xcode cache"
},
{
"cmd": [],
@@ -562,7 +541,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (3)"
+ "name": "Show xcode cache (2)"
},
{
"cmd": [],
@@ -794,7 +773,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (4)"
+ "name": "Show xcode cache (3)"
},
{
"cmd": [],
@@ -827,7 +806,7 @@
"hostname": "rdbhost"
}
},
- "name": "Show xcode cache (5)"
+ "name": "Show xcode cache (4)"
},
{
"cmd": [],
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 668205d..e179752 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -644,30 +644,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:prod"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Global generators.Show xcode cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -708,7 +684,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (2)",
+ "name": "Global generators.Show xcode cache",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -747,7 +723,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (3)",
+ "name": "Global generators.Show xcode cache (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1003,7 +979,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (4)",
+ "name": "Global generators.Show xcode cache (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1042,7 +1018,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (5)",
+ "name": "Global generators.Show xcode cache (4)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 1414a83..b13f695 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -697,30 +697,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Global generators.Show xcode cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -761,7 +737,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (2)",
+ "name": "Global generators.Show xcode cache",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -800,7 +776,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (3)",
+ "name": "Global generators.Show xcode cache (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1056,7 +1032,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (4)",
+ "name": "Global generators.Show xcode cache (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1095,7 +1071,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (5)",
+ "name": "Global generators.Show xcode cache (4)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
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 07c6ec7..2adb691 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -1120,30 +1120,6 @@
},
{
"cmd": [
- "ls",
- "-al",
- "[CACHE]/osx_sdk"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "proj:try"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Global generators.Show xcode cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
"echo",
"[CACHE]/osx_sdk/xcode_9f2000"
],
@@ -1184,7 +1160,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (2)",
+ "name": "Global generators.Show xcode cache",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1223,7 +1199,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (3)",
+ "name": "Global generators.Show xcode cache (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1479,7 +1455,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (4)",
+ "name": "Global generators.Show xcode cache (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -1518,7 +1494,7 @@
"hostname": "rdbhost"
}
},
- "name": "Global generators.Show xcode cache (5)",
+ "name": "Global generators.Show xcode cache (4)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
