Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
https://crrev.com/04925ac3f7e50988945be3a5655198736a8b3e58 chromite_wrapper: add python3 support for except (sjg@chromium.org)
https://crrev.com/4099daa97b38b2ddb95e34d9fc3e2d37f58df069 gclient: Use posixpath-style separators for cipd subdirs on all platforms. (jbudorick@chromium.org)
https://crrev.com/eb5f85b13255cd995b813e7efe5a5f22fd687b0d Fix minor regression in git_upstream_diff. (iannucci@chromium.org)
https://crrev.com/124365b8ea553111c78af62c0d7455423a2238e5 bot_update: default to non-shallow checkouts. (tandrii@chromium.org)
https://crrev.com/f7e1e10db5f949dead75f907934aba0a4dfd8b3d cpplint: Pull in upstream changes (ahassani@google.com)
https://crrev.com/87b879edf86506b63d86895cb1bfbbd60d305fef Stop checking CIPD packages exist on linux-386. (vadimsh@chromium.org)
https://crrev.com/e42137040a01272ae4c515aad3894221abc84b0f gclient: Make gclient respect unmanaged dependencies when syncing. (ehmaldonado@chromium.org)
https://crrev.com/09098853e1073dadc74e18451479b82c0c398164 Demote linux-386 to "best effort support", just like e.g. linux-ppc64. (vadimsh@chromium.org)
https://crrev.com/120b2e4f2660a4c583996d5334cff1fc65c251f0 Add gerrit retries for HTTP 409 Conflict responses. (mmoss@google.com)
https://crrev.com/7999d926809fdb560e58012dddd74b235ea1d99a Revert "cpplint: Pull in upstream changes" (sergiyb@chromium.org)
https://crrev.com/c5a26a769e69377391ed9bf71ca74d7eae5e6717 [win-cross] Support using a zip file for the Windows SDK (hferreiro@igalia.com)
recipe_engine:
https://crrev.com/0e71eb80de4e88898496b6dcc752ca9554c0433c Remove all bootstrapping logic from recipe engine. (iannucci@chromium.org)
https://crrev.com/59ce6b333bae640882c70e5eb79a3f37662925f4 Do not rely on recipes.py to update recipe_engine. (iannucci@chromium.org)
https://crrev.com/76d8765a8b0b0f8702de49231b7f3eba66970afc Prune more evidence of VPython from the environment. (iannucci@chromium.org)
https://crrev.com/94bb0a758456a5df6891677a8cf2876c07ea5f0c Fix typo in autoroll code. (iannucci@chromium.org)
TBR=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I624e5cdf4949dba4509d74ce51166fc10f7622d8
Reviewed-on: https://skia-review.googlesource.com/137129
Reviewed-by: Recipe Roller <recipe-roller@chromium.org>
Commit-Queue: Recipe Roller <recipe-roller@chromium.org>
diff --git a/infra/bots/recipes.py b/infra/bots/recipes.py
index fe6589d..d726c68 100755
--- a/infra/bots/recipes.py
+++ b/infra/bots/recipes.py
@@ -107,7 +107,9 @@
raise MalformedRecipesCfg(ex.message, recipes_cfg_path)
-GIT = 'git.bat' if sys.platform.startswith(('win', 'cygwin')) else 'git'
+_BAT = '.bat' if sys.platform.startswith(('win', 'cygwin')) else ''
+GIT = 'git' + _BAT
+VPYTHON = 'vpython' + _BAT
def _subprocess_call(argv, **kwargs):
@@ -208,7 +210,7 @@
engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
return _subprocess_call([
- sys.executable, '-u',
+ VPYTHON, '-u',
os.path.join(engine_path, 'recipes.py')] + args)
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 62bba19..f5629ce 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -14,12 +14,12 @@
"deps": {
"depot_tools": {
"branch": "master",
- "revision": "081487b9fb0603e9e369ce7ef42c0300a5ca55ae",
+ "revision": "c5a26a769e69377391ed9bf71ca74d7eae5e6717",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"recipe_engine": {
"branch": "master",
- "revision": "a1a47c8bf997d1f069a3ee088ffa7303a1f8a7cb",
+ "revision": "94bb0a758456a5df6891677a8cf2876c07ea5f0c",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},