From a66fde0f9bcb8997015ce9195439cbe3b02c6568 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Tue, 11 Jan 2022 19:05:24 +0000 Subject: [PATCH] Roll recipe dependencies (trivial). This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (recipe_engine) into this repository. The build that created this CL was https://ci.chromium.org/b/8825308075688069089 recipe_engine: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a 7ef38ce (olivernewman@google.com) [recipes.py] Don't silence `git fetch` stderr More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=dpranke@google.com, iannucci@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Ignore-Freeze: Autoroller Bugdroid-Send-Email: False Change-Id: I3710a3fd10ced6c80c28f93d4bac1d35646f94b1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3381004 Commit-Queue: Recipe Roller Bot-Commit: Recipe Roller --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 40 +++++++++++++++++++-------------------- recipes/recipes.py | 5 +---- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index fa25d899a..ba3df758d 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "refs/heads/main", - "revision": "5d7cde1a48076eb0177acc71e00f8513197f6290", + "revision": "7ef38cec62e1193e9eaeb064add76798bb07019a", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index c31df54e7..3b2548abc 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1147,23 +1147,23 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#16)(api):** -[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-assertions -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-milo -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-resultdb -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d7cde1a48076eb0177acc71e00f8513197f6290/recipe_engine/recipe_api.py#883 +[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-assertions +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-milo +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-resultdb +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7ef38cec62e1193e9eaeb064add76798bb07019a/recipe_engine/recipe_api.py#883 diff --git a/recipes/recipes.py b/recipes/recipes.py index 8250010a6..525b0b47d 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -197,10 +197,7 @@ def checkout_engine(engine_path, repo_root, recipes_cfg_path): stdout=NUL, stderr=NUL) except subprocess.CalledProcessError: - _git_check_call(['fetch', url, branch], - cwd=engine_path, - stdout=NUL, - stderr=NUL) + _git_check_call(['fetch', url, branch], cwd=engine_path, stdout=NUL) try: _git_check_call(['diff', '--quiet', revision], cwd=engine_path)