recipe deps autoroll
The last manual roll resulted in mismatched dependencies. This roll
should resolve.
Change-Id: I588b4c81422cd9513a660e1a3fb77ab242594c2c
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/16480
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index ff8bd6d..f132ef7 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -25,37 +25,37 @@
"deps": {
"build": {
"branch": "refs/heads/main",
- "revision": "92d378bfbbcb32197f19366c0e3856c09cc9e265",
+ "revision": "00b514b2ef23b392bf0507fb6756fe69a07c70d9",
"url": "https://chromium.googlesource.com/chromium/tools/build"
},
"chromiumos_config": {
"branch": "refs/heads/main",
- "revision": "2e1e59412fbf1b4793ab62704a0bdd78d69a9635",
+ "revision": "5d1b041e22c7830982f6865506b9a00e2499ce7c",
"url": "https://chromium.googlesource.com/chromiumos/config.git"
},
"chromiumos_proto": {
"branch": "refs/heads/main",
- "revision": "7e1d437e0b4415358626f9eec20a91a4fbe7867c",
+ "revision": "ba457d818f488eaf475e86bb6493ac0f7bf790b6",
"url": "https://chromium.googlesource.com/chromiumos/infra/proto.git"
},
"depot_tools": {
"branch": "refs/heads/main",
- "revision": "11f53d6949438d0735c36998460871dbd1e84bb5",
+ "revision": "190ee6cfc352f7825b82d01209dc925be81c4096",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "dc0138b255542841f288417a14a663ebc7189fae",
+ "revision": "b46c1d455a65262ccbedf5a560793a2bf1d19780",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"infra": {
"branch": "refs/heads/main",
- "revision": "471a9e5159c74a534ec84a0a867b4a691357c0ad",
+ "revision": "caf280796cd072954b769a279060b43fbcc738a7",
"url": "https://chromium.googlesource.com/infra/infra.git"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "c5dc7a267c358f6ba391d200e2fb41d81ce35b23",
+ "revision": "6adf69fe80f4a8a0e3b847ebcafbfaad81cf89a0",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
diff --git a/recipes.py b/recipes.py
index 90c5222..8d550e8 100755
--- a/recipes.py
+++ b/recipes.py
@@ -112,7 +112,9 @@
_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 @@
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 = (