diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 83b6da9198..2a852aa708 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "main", - "revision": "0afd693c9bf53a74e7c575891001a7e0d7491fae", + "revision": "caa777138987d83c540887e5fe3256f69ad0315a", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index f28fdd8fc7..aedf86a8cf 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1121,23 +1121,23 @@ Move things around in a loop! — **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 diff --git a/recipes/recipes.py b/recipes/recipes.py index 90c522250f..8d550e8b85 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -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 = (