Skip to content

C
Chromium_Depot_tools
Commit 96ef6419 authored by recipe-roller's avatar recipe-roller Committed by LUCI CQ
Browse files
Options

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.

recipe_engine:
https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a
  caa7771 (yuanjunh@google.com)
      [python3] Support recipe fetch and bundle to run in py2 and py3...

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

R=iannucci@chromium.org, tandrii@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ia920ce72e2e64c9e9052aa236e10c3a641c28ea6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2964481
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Bot-Commit: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
parent ecdc3625
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 23 deletions
infra/config/recipes.cfg
View file @ 96ef6419
......@@ -16,7 +16,7 @@
"deps": {
"recipe_engine": {
"branch": "main",
"revision": "0afd693c9bf53a74e7c575891001a7e0d7491fae",
"revision": "caa777138987d83c540887e5fe3256f69ad0315a",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
......
recipes/README.recipes.md
View file @ 96ef6419
......@@ -1121,23 +1121,23 @@ Move things around in a loop!
&mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-assertions
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-cq
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-milo
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-resultdb
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/0afd693c9bf53a74e7c575891001a7e0d7491fae/recipe_engine/recipe_api.py#875
[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-assertions
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-cq
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-milo
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-resultdb
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/caa777138987d83c540887e5fe3256f69ad0315a/recipe_engine/recipe_api.py#875
recipes/recipes.py
View file @ 96ef6419
......@@ -112,7 +112,9 @@ IS_WIN = sys.platform.startswith(('win', 'cygwin'))
_BAT = '.bat' if IS_WIN else ''
GIT = 'git' + _BAT
VPYTHON = 'vpython' + _BAT
VPYTHON = ('vpython' +
('3' if os.getenv('RECIPES_USE_PY3') == 'true' else '') +
_BAT)
CIPD = 'cipd' + _BAT
REQUIRED_BINARIES = {GIT, VPYTHON, CIPD}
......@@ -241,7 +243,6 @@ def main():
repo_root = os.path.abspath(repo_root).decode()
recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg')
args = ['--package', recipes_cfg_path] + args
engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
argv = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment