Manual roll of recipes.
This is required because a few params were deleted from the fuchsia/git module.
Change-Id: I58abc5f160c3133c41cb1382b97aa548a88e586f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/50240
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index c63d93a..8f8e98f 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -22,22 +22,22 @@
"deps": {
"dart": {
"branch": "refs/heads/main",
- "revision": "73f246c24fd8c13612261586b7e4c19dfb68551a",
+ "revision": "06438bd383aaee663cbf6746ce3443973520b497",
"url": "https://dart.googlesource.com/recipes.git"
},
"depot_tools": {
"branch": "refs/heads/main",
- "revision": "2d5c673fdb0072bb7b0c7463e6e7e18d0170b288",
+ "revision": "bb14391a5092f01557cf1fedfa3f7fe3afdbd1fb",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "a30d331cc84925b7a9ce1fd03efee40aa55ea21d",
+ "revision": "b194835f1340b0f8796bab1c0648afa05b08fce5",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "4a2746f139694c98ed18b2059c945287b5d92c0f",
+ "revision": "f4da958651245c502ddc163813f920c91adedd33",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/recipe_modules/recipe_testing/tests/full.expected/excluded.json b/recipe_modules/recipe_testing/tests/full.expected/excluded.json
index bbe4281..9f89a34 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/excluded.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/excluded.json
@@ -181,8 +181,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json b/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
index fef52e4..b59ba17 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
@@ -174,8 +174,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json b/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
index d74ee26..0153f44 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
@@ -174,8 +174,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
index e858a7e..c924780 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
@@ -174,8 +174,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json b/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
index ebce9bf..ed15988 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
@@ -168,8 +168,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes.json b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
index 7097466..814519a 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
@@ -172,8 +172,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json b/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
index f8c58ba..3f1af33 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
@@ -172,8 +172,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
index b587e1c..64cf735 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
@@ -172,8 +172,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json b/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
index aa67bf6..7223cea 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
@@ -169,8 +169,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
index fb36647..ee423de 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
@@ -174,8 +174,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
index 0030639..f9f8eff 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
@@ -174,8 +174,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipe_path",
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index cacf66b..c6ebb3b 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -1589,8 +1589,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipes",
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index cacf66b..c6ebb3b 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -1589,8 +1589,11 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
+ "--ignore-submodules=all",
"HEAD"
],
"cwd": "[START_DIR]/recipes",
diff --git a/recipes/tricium/tricium.expected/basic.json b/recipes/tricium/tricium.expected/basic.json
index 4737c02..6cbed37 100644
--- a/recipes/tricium/tricium.expected/basic.json
+++ b/recipes/tricium/tricium.expected/basic.json
@@ -869,9 +869,10 @@
"diff-tree",
"--no-commit-id",
"--name-only",
+ "--find-renames=100%",
+ "--diff-filter=rd",
"-r",
"-z",
- "--diff-filter=d",
"--ignore-submodules=all",
"HEAD"
],
@@ -1090,7 +1091,7 @@
"cmd": [],
"name": "write results",
"~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@tricium@\"{\\n\\\"comments\\\": [\\n{\\n\\\"category\\\": \\\"Format/YAPF\\\",\\n\\\"message\\\": \\\"File not formatted properly.\\\\nRun the following to format:\\\\n\\\\nfx format-code --files=engine.py\\\",\\n\\\"path\\\": \\\"engine.py\\\"\\n}\\n]\\n}\"@@@"
+ "@@@SET_BUILD_PROPERTY@tricium@\"{\\n\\\"comments\\\": [\\n{\\n\\\"category\\\": \\\"Format/YAPF\\\",\\n\\\"message\\\": \\\"File not formatted properly.\\\\nRun the following to format:\\\\n\\\\nyapf --in-place engine.py\\\",\\n\\\"path\\\": \\\"engine.py\\\"\\n}\\n]\\n}\"@@@"
]
},
{
diff --git a/recipes/tricium/tricium.py b/recipes/tricium/tricium.py
index c62035b..e5a2df0 100644
--- a/recipes/tricium/tricium.py
+++ b/recipes/tricium/tricium.py
@@ -1,6 +1,7 @@
# Copyright 2020 The Fuchsia Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+
"""Recipe for running Tricium analyzers."""
import functools
@@ -29,7 +30,6 @@
# is unspecified, or explicitly set.
TRICIUM_GIT_ATTR = "tricium"
-
# Namedtuple to simulate a class generated by jiri checkout because flutter is
# not using jiri.
_CheckoutResult = collections.namedtuple(
@@ -40,48 +40,38 @@
def RunSteps(api, props):
- with api.context(infra_steps=True):
- checkout_path = api.path['start_dir'].join('recipes')
- api.git_checkout(REMOTE, path=checkout_path)
- # tricium is expecting a dictionary as a checkout.
- checkout = _CheckoutResult(checkout_path, '')
+ with api.context(infra_steps=True):
+ checkout_path = api.path['start_dir'].join('recipes')
+ api.git_checkout(REMOTE, path=checkout_path)
+ # tricium is expecting a dictionary as a checkout.
+ checkout = _CheckoutResult(checkout_path, '')
- # If specified, download CIPD packages.
- if props.cipd_packages:
- with api.step.nest("ensure_packages"):
- with api.context(infra_steps=True):
- cipd_dir = api.path['start_dir'].join("cipd")
- pkgs = api.cipd.EnsureFile()
- for package in props.cipd_packages:
- pkgs.add_package(
- package.name, package.version, subdir=package.subdir
- )
- api.cipd.ensure(cipd_dir, pkgs)
- api.tricium_analyze.yapf = cipd_dir.join("yapf")
+ # If specified, download CIPD packages.
+ if props.cipd_packages:
+ with api.step.nest("ensure_packages"):
+ with api.context(infra_steps=True):
+ cipd_dir = api.path['start_dir'].join("cipd")
+ pkgs = api.cipd.EnsureFile()
+ for package in props.cipd_packages:
+ pkgs.add_package(package.name, package.version, subdir=package.subdir)
+ api.cipd.ensure(cipd_dir, pkgs)
+ api.tricium_analyze.yapf = cipd_dir.join("yapf")
- api.tricium_analyze.check_commit_message()
- with api.context(cwd=checkout_path):
- api.step('git log', ['git', 'log', '--oneline', '-n', '3'])
- paths = api.git.get_changed_files(
- "get changed files",
- deleted=False,
- # If we include submodules then the output will include the
- # directory paths of those submodules, but tricium_analyze operates
- # on files, not directories. If we ever want to analyze changes to
- # files within submodules, we can instead do a submodule-aware diff
- # to get the paths to changed files within the submodule.
- ignore_submodules=True,
- )
- api.tricium_analyze.checkout = checkout
- api.tricium_analyze(
- paths,
- enabled_analyzers=props.analyses,
- enabled_luci_analyzers=props.luci_analyzers,
- )
+ api.tricium_analyze.check_commit_message()
+ with api.context(cwd=checkout_path):
+ api.step('git log', ['git', 'log', '--oneline', '-n', '3'])
+ paths = api.git.get_changed_files("get changed files")
+ api.tricium_analyze.checkout = checkout
+ api.tricium_analyze.suggest_fx = False
+ api.tricium_analyze(
+ paths,
+ enabled_analyzers=props.analyses,
+ enabled_luci_analyzers=props.luci_analyzers,
+ )
def GenTests(api):
- DIFF = """diff --git a/{0} b/{0}
+ DIFF = """diff --git a/{0} b/{0}
index e684c1e..a76a10e 100644
--- a/{0}
+++ b/{0}
@@ -90,47 +80,42 @@
+ bar
"""
- def changed_files_data(files):
- return api.git.get_changed_files("get changed files", files)
+ def changed_files_data(files):
+ return api.git.get_changed_files("get changed files", files)
- def change_diff_data(filename):
- return api.step_data(
- f"analyze {filename}.get change diff",
- api.raw_io.stream_output_text(DIFF.format(filename)),
- )
-
- def formatted_diff_data(filename):
- return api.step_data(
- f"analyze {filename}.get formatted diff",
- api.raw_io.stream_output_text(DIFF.format(filename)),
- )
-
- def properties(cipd_packages=(), **kwargs):
- defaults = dict(
- manifest="flower",
- remote="https://fuchsia.googlesource.com/integration",
- )
- # Using CIPD packages implies that we don't need to do a build, and
- # vice versa.
- if cipd_packages:
- defaults["cipd_packages"] = cipd_packages
- defaults.update(kwargs)
- return api.properties(**defaults)
-
- yield api.test(
- 'basic',
- api.buildbucket_util.test("default", tryjob=True),
- properties(
- analyses=["yapf"],
- cipd_packages=[
- {
- "name": "fuchsia/go/${platform}",
- "version": "integration",
- "subdir": "go",
- }
- ],
- ),
- changed_files_data(["engine.py"]),
- change_diff_data("engine.py"),
- formatted_diff_data("engine.py")
+ def change_diff_data(filename):
+ return api.step_data(
+ f"analyze {filename}.get change diff",
+ api.raw_io.stream_output_text(DIFF.format(filename)),
)
+
+ def formatted_diff_data(filename):
+ return api.step_data(
+ f"analyze {filename}.get formatted diff",
+ api.raw_io.stream_output_text(DIFF.format(filename)),
+ )
+
+ def properties(cipd_packages=(), **kwargs):
+ defaults = dict(
+ manifest="flower",
+ remote="https://fuchsia.googlesource.com/integration",
+ )
+ # Using CIPD packages implies that we don't need to do a build, and
+ # vice versa.
+ if cipd_packages:
+ defaults["cipd_packages"] = cipd_packages
+ defaults.update(kwargs)
+ return api.properties(**defaults)
+
+ yield api.test(
+ 'basic', api.buildbucket_util.test("default", tryjob=True),
+ properties(
+ analyses=["yapf"],
+ cipd_packages=[{
+ "name": "fuchsia/go/${platform}",
+ "version": "integration",
+ "subdir": "go",
+ }],
+ ), changed_files_data(["engine.py"]), change_diff_data("engine.py"),
+ formatted_diff_data("engine.py")
+ )
