Fix problem in remote path calculation.
In the remote path calculation the commit hash in the path was being
merged with the flutter part. This fixes the path problem and updates
tests to catch this problem in the future with the expectations.
Bug: https://github.com/flutter/flutter/issues/114227
Change-Id: Iee834ba94f8ecfa2aa34f5db57921abda1fad16e
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35165
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/recipe_modules/archives/api.py b/recipe_modules/archives/api.py
index c3e093d..abd1038 100644
--- a/recipe_modules/archives/api.py
+++ b/recipe_modules/archives/api.py
@@ -95,8 +95,9 @@
bucket, path = self._split_dst_parts(dst)
dir_part = self.m.path.dirname(path)
archive_dir = self.m.path.mkdtemp()
- self.m.file.ensure_directory('Ensure %s' % dir_part, archive_dir.join(dir_part))
- self.m.file.copy('Copy %s' % dst, src, archive_dir.join(dir_part))
+ local_dst_tree = archive_dir.join(*dir_part.split('/'))
+ self.m.file.ensure_directory('Ensure %s' % dir_part, local_dst_tree)
+ self.m.file.copy('Copy %s' % dst, src, local_dst_tree)
self.m.gsutil.upload(
source='%s/*' % archive_dir,
bucket=bucket,
@@ -119,6 +120,16 @@
"""
results = []
file_list = self._full_path_list(checkout, archive_config)
+ # Calculate prefix and commit.
+ is_monorepo = self.m.buildbucket.gitiles_commit.project == 'monorepo'
+
+ if is_monorepo:
+ commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
+ artifact_prefix = 'monorepo/'
+ else:
+ commit = self.m.repo_util.get_commit(checkout.join('flutter'))
+ artifact_prefix = ''
+
for include_path in file_list:
is_android_artifact = ANDROID_ARTIFACTS_BUCKET in include_path
dir_part = self.m.path.dirname(include_path)
@@ -126,14 +137,6 @@
rel_path = self.m.path.relpath(dir_part, full_base_path)
rel_path = '' if rel_path == '.' else rel_path
base_name = self.m.path.basename(include_path)
- is_monorepo = self.m.buildbucket.gitiles_commit.project == 'monorepo'
-
- if is_monorepo:
- commit = self.m.repo_util.get_commit(checkout.join('../../monorepo'))
- artifact_prefix = 'monorepo/'
- else:
- commit = self.m.repo_util.get_commit(checkout.join('flutter'))
- artifact_prefix = ''
if is_android_artifact:
# We are not using a slash in the first parameter becase artifact_prefix
@@ -141,7 +144,7 @@
artifact_path = '%s%s/%s' % (
artifact_prefix, rel_path, base_name)
else:
- artifact_path = '%sflutter_infra_release/flutter%s/%s/%s' % (
+ artifact_path = '%sflutter_infra_release/flutter/%s/%s/%s' % (
artifact_prefix, commit, rel_path, base_name)
results.append(
diff --git a/recipe_modules/archives/examples/full.expected/basic.json b/recipe_modules/archives/examples/full.expected/basic.json
index 77b7707..8bf6f5c 100644
--- a/recipe_modules/archives/examples/full.expected/basic.json
+++ b/recipe_modules/archives/examples/full.expected/basic.json
@@ -30,46 +30,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/flutter",
- "infra_step": true,
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/flutter",
- "infra_step": true,
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/flutter",
- "infra_step": true,
- "name": "git rev-parse (4)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/flutter",
- "infra_step": true,
- "name": "git rev-parse (5)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -78,10 +38,10 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -92,10 +52,10 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"cmd": [
@@ -111,7 +71,7 @@
"gs://flutter_archives_v2/"
],
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
diff --git a/recipe_modules/archives/examples/full.expected/monorepo_gcs.json b/recipe_modules/archives/examples/full.expected/monorepo_gcs.json
index 68407c6..0e68782 100644
--- a/recipe_modules/archives/examples/full.expected/monorepo_gcs.json
+++ b/recipe_modules/archives/examples/full.expected/monorepo_gcs.json
@@ -54,94 +54,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/../../monorepo",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/../../monorepo",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/../../monorepo",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (4)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[START_DIR]/../../monorepo",
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (5)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -150,7 +62,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -165,7 +77,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "name": "Ensure monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
},
{
"cmd": [
@@ -176,7 +88,7 @@
"/path/to/tmp/json",
"copy",
"[START_DIR]/out/android_profile/zip_archives/android-arm-profile/artifacts.zip",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile"
],
"infra_step": true,
"luci_context": {
@@ -191,7 +103,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
+ "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip"
},
{
"cmd": [
@@ -219,7 +131,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
+ "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-arm-profile/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 0b5f503..f30be19 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -403,62 +403,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -467,7 +411,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -489,7 +433,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
},
{
"cmd": [
@@ -499,8 +443,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -522,7 +466,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -557,7 +501,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt",
+ "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -572,7 +516,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -594,7 +538,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure /"
},
{
"cmd": [
@@ -604,8 +548,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -627,7 +571,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2//download.flutter.io"
},
{
"cmd": [
@@ -662,112 +606,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Ensure out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Copy gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "gsutil out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil /download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -776,7 +615,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/basic_custom_vars.json b/recipes/engine_v2/builder.expected/basic_custom_vars.json
index d33b993..6e27b68 100644
--- a/recipes/engine_v2/builder.expected/basic_custom_vars.json
+++ b/recipes/engine_v2/builder.expected/basic_custom_vars.json
@@ -707,62 +707,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -771,7 +715,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -793,7 +737,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out"
+ "name": "Ensure flutter_infra_release/flutter//android-x86-jit-release"
},
{
"cmd": [
@@ -803,8 +747,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -826,7 +770,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -861,7 +805,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt",
+ "name": "gsutil flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -876,7 +820,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -898,7 +842,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure /"
},
{
"cmd": [
@@ -908,8 +852,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -931,7 +875,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2//download.flutter.io"
},
{
"cmd": [
@@ -966,112 +910,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Ensure out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Copy gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "gsutil out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil /download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -1080,7 +919,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/basic_gcs.json b/recipes/engine_v2/builder.expected/basic_gcs.json
index 8888c83..f30be19 100644
--- a/recipes/engine_v2/builder.expected/basic_gcs.json
+++ b/recipes/engine_v2/builder.expected/basic_gcs.json
@@ -403,62 +403,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -467,7 +411,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -489,7 +433,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "name": "Ensure flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
},
{
"cmd": [
@@ -499,8 +443,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -522,7 +466,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -557,7 +501,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out/host_debug_unopt",
+ "name": "gsutil flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -572,7 +516,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -594,7 +538,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure /"
},
{
"cmd": [
@@ -604,8 +548,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -627,7 +571,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2//download.flutter.io"
},
{
"cmd": [
@@ -662,112 +606,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Ensure out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Copy gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "gsutil out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil /download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -776,7 +615,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
index e319896..f1c77fc 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
@@ -733,86 +733,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -821,7 +741,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -855,7 +775,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure flutter_infra_release/flutter/out"
+ "name": "Ensure flutter_infra_release/flutter//android-x86-jit-release"
},
{
"cmd": [
@@ -865,8 +785,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -900,7 +820,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -947,7 +867,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt",
+ "name": "gsutil flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -960,7 +880,7 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -996,7 +916,7 @@
},
"name": "Compute file hash",
"~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: bec717bf6cd9f8126d10782e5ed69f4de69245f5d0b19b81df21e7e55e4dd9d4@@@"
+ "@@@STEP_TEXT@Hash calculated: 514e872bece8d7ee7d52fd8e7ef7b801e964e9d45bf1b7c084369533781038c7@@@"
]
},
{
@@ -1004,9 +924,9 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "bec717bf6cd9f8126d10782e5ed69f4de69245f5d0b19b81df21e7e55e4dd9d4",
+ "514e872bece8d7ee7d52fd8e7ef7b801e964e9d45bf1b7c084369533781038c7",
"-gcs-uri",
- "gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "gs://flutter_archives_v2/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -1051,7 +971,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -1085,7 +1005,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure /"
},
{
"cmd": [
@@ -1095,8 +1015,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -1130,7 +1050,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2//download.flutter.io"
},
{
"cmd": [
@@ -1177,7 +1097,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
+ "name": "gsutil /download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -1190,7 +1110,7 @@
"--json-output",
"/path/to/tmp/json",
"file_hash",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -1226,7 +1146,7 @@
},
"name": "Compute file hash (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: 9779c0ee68c3a22baf1da9b44f5f3505e2833e3c5b5e5d317bfb5be9c924dc8e@@@"
+ "@@@STEP_TEXT@Hash calculated: e562a8287043cc08772883e4f94791f8909c9f206c74e3db0f6977d2855c86ba@@@"
]
},
{
@@ -1234,9 +1154,9 @@
"[START_DIR]/reporter/snoopy_broker",
"-report-gcs",
"-digest",
- "9779c0ee68c3a22baf1da9b44f5f3505e2833e3c5b5e5d317bfb5be9c924dc8e",
+ "e562a8287043cc08772883e4f94791f8909c9f206c74e3db0f6977d2855c86ba",
"-gcs-uri",
- "gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "gs://flutter_archives_v2//download.flutter.io"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -1273,236 +1193,6 @@
},
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Ensure out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Copy gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "gsutil out/host_debug_unopt/download.flutter.io",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "file_hash",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Compute file hash (3)",
- "~followup_annotations": [
- "@@@STEP_TEXT@Hash calculated: b44a4873962783d418872d9324aadf52fbd7aa206534b7158ea61c3cdc8cfea2@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/reporter/snoopy_broker",
- "-report-gcs",
- "-digest",
- "b44a4873962783d418872d9324aadf52fbd7aa206534b7158ea61c3cdc8cfea2",
- "-gcs-uri",
- "gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "dart-internal:flutter"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "snoop: report_gcs (3)"
- },
- {
- "cmd": [
"[START_DIR]/reporter/snoopy_broker",
"-report-stage",
"-stage",
@@ -1545,7 +1235,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 5d141f4..01dc916 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -477,62 +477,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -541,7 +485,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -563,7 +507,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out"
+ "name": "Ensure flutter_infra_release/flutter//android-x86-jit-release"
},
{
"cmd": [
@@ -573,8 +517,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/out"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -596,7 +540,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -631,7 +575,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt",
+ "name": "gsutil flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -646,7 +590,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -668,7 +612,7 @@
]
},
"infra_step": true,
- "name": "Ensure flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure /"
},
{
"cmd": [
@@ -678,8 +622,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -701,7 +645,7 @@
]
},
"infra_step": true,
- "name": "Copy gs://flutter_archives_v2/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2//download.flutter.io"
},
{
"cmd": [
@@ -736,112 +680,7 @@
]
},
"infra_step": true,
- "name": "gsutil flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Ensure out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "Copy gs://flutter_archives_v2/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "darwin",
- "REVISION": ""
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "name": "gsutil out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil /download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -859,7 +698,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index b4fe57b..0389aa1 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -642,86 +642,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/engine/src/../../monorepo",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/engine/src/../../monorepo",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -730,7 +650,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/out"
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -764,7 +684,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure monorepo/flutter_infra_release/flutter/out"
+ "name": "Ensure monorepo/flutter_infra_release/flutter//android-x86-jit-release"
},
{
"cmd": [
@@ -774,8 +694,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/out"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -809,7 +729,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -856,7 +776,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil monorepo/flutter_infra_release/flutter/out/host_debug_unopt",
+ "name": "gsutil monorepo/flutter_infra_release/flutter//android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -871,7 +791,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2/monorepo"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -905,7 +825,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure monorepo"
},
{
"cmd": [
@@ -915,8 +835,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2/monorepo"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -950,7 +870,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2/monorepo//download.flutter.io"
},
{
"cmd": [
@@ -997,148 +917,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil monorepo/flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/monorepo/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Ensure monorepo/out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/monorepo/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Copy gs://flutter_archives_v2/monorepo/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "gsutil monorepo/out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil monorepo//download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -1147,7 +926,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.expected/monorepo_gcs.json b/recipes/engine_v2/builder.expected/monorepo_gcs.json
index 881f4fb..d244313 100644
--- a/recipes/engine_v2/builder.expected/monorepo_gcs.json
+++ b/recipes/engine_v2/builder.expected/monorepo_gcs.json
@@ -642,86 +642,6 @@
},
{
"cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/engine/src/../../monorepo",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (2)"
- },
- {
- "cmd": [
- "git",
- "rev-parse",
- "HEAD"
- ],
- "cwd": "[CACHE]/builder/engine/src/../../monorepo",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "git rev-parse (3)"
- },
- {
- "cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
@@ -730,7 +650,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -764,7 +684,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "name": "Ensure monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
},
{
"cmd": [
@@ -774,8 +694,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt",
- "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "[CLEANUP]/tmp_tmp_1/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -809,7 +729,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out/host_debug_unopt"
+ "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip"
},
{
"cmd": [
@@ -856,7 +776,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil monorepo/flutter_infra_release/flutter12345abcde12345abcde12345abcde12345abcde/out/host_debug_unopt",
+ "name": "gsutil monorepo/flutter_infra_release/flutter/12345abcde12345abcde12345abcde12345abcde/android-x86-jit-release/artifacts.zip",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -871,7 +791,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CLEANUP]/tmp_tmp_2/monorepo"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -905,7 +825,7 @@
"hostname": "rdbhost"
}
},
- "name": "Ensure monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "name": "Ensure monorepo"
},
{
"cmd": [
@@ -915,8 +835,8 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt/file.zip",
- "[CLEANUP]/tmp_tmp_2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt"
+ "[CACHE]/builder/engine/src/out/android_jit_release_x86/zip_archives/download.flutter.io",
+ "[CLEANUP]/tmp_tmp_2/monorepo"
],
"cwd": "[CACHE]/builder/engine/src/flutter",
"env": {
@@ -950,7 +870,7 @@
"hostname": "rdbhost"
}
},
- "name": "Copy gs://flutter_archives_v2/monorepo/flutter_infra_release/flutter/out/host_debug_unopt/file.zip"
+ "name": "Copy gs://flutter_archives_v2/monorepo//download.flutter.io"
},
{
"cmd": [
@@ -997,148 +917,7 @@
"hostname": "rdbhost"
}
},
- "name": "gsutil monorepo/flutter_infra_release/flutter/out/host_debug_unopt/file.zip",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CLEANUP]/tmp_tmp_3/monorepo/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Ensure monorepo/out/host_debug_unopt"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[CACHE]/builder/engine/src/out/host_debug_unopt/download.flutter.io",
- "[CLEANUP]/tmp_tmp_3/monorepo/out/host_debug_unopt"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Copy gs://flutter_archives_v2/monorepo/out/host_debug_unopt/download.flutter.io"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "-r",
- "[CLEANUP]/tmp_tmp_3/*",
- "gs://flutter_archives_v2/"
- ],
- "cwd": "[CACHE]/builder/engine/src/flutter",
- "env": {
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "ENGINE_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "dart:ci.sandbox"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "gsutil monorepo/out/host_debug_unopt/download.flutter.io",
+ "name": "gsutil monorepo//download.flutter.io",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_archives_v2/@@@"
]
@@ -1147,7 +926,7 @@
"cmd": [],
"name": "Set output properties",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\", \"host_debug_unopt\": null}@@@"
+ "@@@SET_BUILD_PROPERTY@cas_output_hash@{\"android_jit_release_x86\": null, \"full_build\": \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0\"}@@@"
]
},
{
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py
index 2c37728..a1f990f 100644
--- a/recipes/engine_v2/builder.py
+++ b/recipes/engine_v2/builder.py
@@ -181,13 +181,15 @@
def GenTests(api):
build = {
"archives": [
- {
- "name": "host_debug_unopt",
- "type": "cas",
- "include_paths": ['out/host_debug_unopt/', 'out/host_debug_unopt/file.zip',
- 'out/host_debug_unopt/download.flutter.io'],
- "exclude_paths": ['out/host_debug_unopt/obj', 'out/host_debug_unopt/stripped.exe']
- }
+ {
+ "name": "android_jit_release_x86",
+ "type": "gcs",
+ "base_path": "out/android_jit_release_x86/zip_archives/",
+ "include_paths": [
+ "out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip",
+ "out/android_jit_release_x86/zip_archives/download.flutter.io"
+ ]
+ }
],
"gn": ["--ios"], "ninja": {"config": "ios_debug", "targets": []},
"generators": {
@@ -207,7 +209,15 @@
}
]
}
- yield api.test('basic', api.properties(build=build, no_goma=True))
+ yield api.test(
+ 'basic',
+ api.properties(build=build, no_goma=True),
+ api.step_data(
+ 'git rev-parse',
+ stdout=api.raw_io
+ .output_text('12345abcde12345abcde12345abcde12345abcde\n')
+ )
+ )
yield api.test(
'mac', api.properties(build=build, no_goma=True),
api.platform('mac', 64),
