Roll recipe dependencies (nontrivial).
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).
Please review the expectation changes, and LGTM+CQ.
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
depot_tools:
https://crrev.com/5300616351f523c605de80f5ece8c29321a78847 bot_update: expose patch_refs as an option to ensure_checkout. (jbudorick@chromium.org)
R=borenet@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I3719ebfe726d6662c0e3b8a9f4e21ca62000a292
Reviewed-on: https://skia-review.googlesource.com/145144
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json
index 30f707c..c066736 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json
@@ -42,12 +42,12 @@
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"parent_repo@abc123"
],
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
index 464bbc0..15cee7e 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json
@@ -42,12 +42,12 @@
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"src/flutter@origin/master",
"--revision",
diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/test.json b/infra/bots/recipe_modules/checkout/examples/full.expected/test.json
index ef0d496..de53cd1 100644
--- a/infra/bots/recipe_modules/checkout/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/checkout/examples/full.expected/test.json
@@ -42,12 +42,12 @@
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"skia@abc123"
],
diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
index ec19d7d..9f74bf2 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
@@ -42,12 +42,12 @@
"[CUSTOM_/_B_CACHE]",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"skia@abc123"
],
diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
index 1f063a1..dee375a 100644
--- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
+++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
@@ -42,12 +42,12 @@
"[CUSTOM_/_B_CACHE]",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"skia@abc123"
],
diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
index bbb1e81..85182df 100644
--- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
+++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json
@@ -42,12 +42,12 @@
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
"--gerrit_repo",
"https://skia.googlesource.com/skia.git",
"--gerrit_ref",
"refs/changes/89/456789/12",
- "--output_json",
- "/path/to/tmp/json",
"--revision",
"skia@abc123"
],
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index dd06e18..283ed60 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -14,7 +14,7 @@
"deps": {
"depot_tools": {
"branch": "master",
- "revision": "6f812e132d25df1b561f7182b04903004a3055e4",
+ "revision": "5300616351f523c605de80f5ece8c29321a78847",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"recipe_engine": {