have codesign cipd package default to latest ref
Change-Id: I65a542933f6e16c189c412459ef7fd540c99fd76
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/60401
Commit-Queue: Christopher Fujino <fujino@google.com>
Reviewed-by: Chris Bracken <cbracken@google.com>
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index 34f31b3..fc15bb1 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -82,7 +82,6 @@
'clang': self.clang,
'cmake': self.cmake,
'codesign': self.codesign,
- 'cosign': self.cosign,
'curl': self.curl,
'dart_sdk': self.dart_sdk,
'dashing': self.dashing,
@@ -106,6 +105,8 @@
parsed_deps = []
for dep in deps:
dependency = dep.get('dependency')
+ # TODO(fujino): Enforce a hard requirement that there be a version here,
+ # and it isn't `latest`: https://github.com/flutter/flutter/issues/156621
version = dep.get('version')
# Ensure there are no duplicate entries
if dependency in parsed_deps:
@@ -471,7 +472,7 @@
env(dict): Current environment variables.
env_prefixes(dict): Current environment prefixes variables.
"""
- version = version or 'live'
+ version = version or 'latest'
codesign_path = self.m.path.mkdtemp()
codesign = self.m.cipd.EnsureFile()
codesign.add_package('flutter/codesign/${platform}', version)
@@ -482,23 +483,6 @@
env_prefixes['PATH'] = paths
return codesign_path / 'codesign'
- def cosign(self, env, env_prefixes, version=None):
- """Installs cosign.
-
- Args:
- env(dict): Current environment variables.
- env_prefixes(dict): Current environment prefixes variables.
- """
- version = version or 'latest'
- cosign_path = self.m.path.cache_dir / 'cosign'
- cosign = self.m.cipd.EnsureFile()
- cosign.add_package('flutter/tools/cosign/${platform}', version)
- with self.m.step.nest('Install cosign'):
- self.m.cipd.ensure(cosign_path, cosign)
- paths = env_prefixes.get('PATH', [])
- paths.append(cosign_path / 'bin')
- env_prefixes['PATH'] = paths
-
def ninja(self, env, env_prefixes, version=None):
"""Installs ninja.
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index 38c35b9..3cbbdb4 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -558,39 +558,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index 38c35b9..3cbbdb4 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -558,39 +558,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/linux.json b/recipe_modules/flutter_deps/examples/full.expected/linux.json
index 38c35b9..3cbbdb4 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/linux.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/linux.json
@@ -558,39 +558,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
index 7e54426..b8b201c 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
@@ -642,39 +642,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
index 037b415..faadc6d 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
@@ -642,39 +642,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 53f8e98..7519fc5 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -627,39 +627,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
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 db31127..fa048dc 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
@@ -627,39 +627,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/noop_golds_official_builds.json b/recipe_modules/flutter_deps/examples/full.expected/noop_golds_official_builds.json
index ed72aba..abd63f4 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/noop_golds_official_builds.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/noop_golds_official_builds.json
@@ -789,51 +789,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json
index a212d7f..6680270 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json
@@ -558,39 +558,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd.bat",
- "ensure",
- "-root",
- "[CACHE]\\cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
@@ -874,7 +841,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json
index 6f9828f..baaea77 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json
@@ -558,39 +558,6 @@
},
{
"cmd": [],
- "name": "Install cosign"
- },
- {
- "cmd": [
- "cipd.bat",
- "ensure",
- "-root",
- "[CACHE]\\cosign",
- "-ensure-file",
- "flutter/tools/cosign/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "Install cosign.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/tools/cosign/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
"name": "Install ninja"
},
{
@@ -874,7 +841,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1000,7 +966,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1056,7 +1021,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1121,7 +1085,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1172,7 +1135,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1226,7 +1188,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1285,7 +1246,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1342,7 +1302,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
@@ -1398,7 +1357,6 @@
"[START_DIR]\\firebase",
"[CACHE]\\cmake\\bin",
"[CLEANUP]\\tmp_tmp_3",
- "[CACHE]\\cosign\\bin",
"[CACHE]\\ninja",
"[CACHE]\\clang\\bin",
"[CLEANUP]\\tmp_tmp_5\\curl",
diff --git a/recipe_modules/flutter_deps/examples/full.py b/recipe_modules/flutter_deps/examples/full.py
index 93229e6..a92cec0 100644
--- a/recipe_modules/flutter_deps/examples/full.py
+++ b/recipe_modules/flutter_deps/examples/full.py
@@ -75,7 +75,6 @@
env, env_prefixes, version='build_id:8787856497187628321'
)
api.flutter_deps.codesign(env, env_prefixes, 'latest')
- api.flutter_deps.cosign(env, env_prefixes)
api.flutter_deps.ninja(env, env_prefixes)
api.flutter_deps.clang(env, env_prefixes)
api.flutter_deps.apple_signing(env, env_prefixes)
diff --git a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
index 46a8867..e7f2f8e 100644
--- a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
+++ b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
@@ -24,7 +24,7 @@
"-root",
"[CLEANUP]/tmp_tmp_1",
"-ensure-file",
- "flutter/codesign/${platform} live",
+ "flutter/codesign/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -37,7 +37,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-live------------\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/codesign/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
index 46a8867..e7f2f8e 100644
--- a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
+++ b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
@@ -24,7 +24,7 @@
"-root",
"[CLEANUP]/tmp_tmp_1",
"-ensure-file",
- "flutter/codesign/${platform} live",
+ "flutter/codesign/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -37,7 +37,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-live------------\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/codesign/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipe_modules/swarming_retry/api.py b/recipe_modules/swarming_retry/api.py
index 84b8397..4d38230 100644
--- a/recipe_modules/swarming_retry/api.py
+++ b/recipe_modules/swarming_retry/api.py
@@ -185,6 +185,7 @@
)
def process_result(self, attempt, result):
+ # TODO(fujino): ensure this is never empty, https://crbug.com/369586985
with self._api.step.nest(result.builder.builder):
self._in_progress_attempts.remove(attempt)
attempt.result = result
diff --git a/recipes/engine_v2/builder.expected/mac_release_candidate.json b/recipes/engine_v2/builder.expected/mac_release_candidate.json
index 622d83a..5aeed4b 100644
--- a/recipes/engine_v2/builder.expected/mac_release_candidate.json
+++ b/recipes/engine_v2/builder.expected/mac_release_candidate.json
@@ -3854,7 +3854,7 @@
"-root",
"[CLEANUP]/tmp_tmp_5",
"-ensure-file",
- "flutter/codesign/${platform} live",
+ "flutter/codesign/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -3914,7 +3914,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-live------------\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/codesign/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
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 7af5821..e054ec9 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -2212,7 +2212,7 @@
"-root",
"[CLEANUP]/tmp_tmp_3",
"-ensure-file",
- "flutter/codesign/${platform} live",
+ "flutter/codesign/${platform} latest",
"-max-threads",
"0",
"-json-output",
@@ -2261,7 +2261,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-live------------\",@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"flutter/codesign/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
