From 3390eddc9717abdc739577fa8f36c7f694465dd1 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 17 Jun 2019 20:06:03 +0000 Subject: [PATCH] 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. recipe_engine: https://crrev.com/8b75d5d75414bb2756bcf0b5188918887da8db20 Remove json_result leftovers (martiniss@google.com) R=recipe-roller@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I188aa6931a46fc2416228ffa308692cf0591f1cc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1661367 Commit-Queue: Robbie Iannucci Reviewed-by: Robbie Iannucci --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 32 +++++++++---------- .../examples/full.expected/pkg_bad_file.json | 2 +- .../examples/full.expected/pkg_bad_mode.json | 2 +- .../full.expected/pkg_bad_verfile.json | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 713d479b1..5b522a6dd 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "bdc5cd8872c898ccb123cf7ea29d7a7975f28364", + "revision": "8b75d5d75414bb2756bcf0b5188918887da8db20", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 64f42dce8..e9a1298bf 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1003,19 +1003,19 @@ Move things around in a loop! — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-source_manifest -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/README.recipes.md#recipe_modules-url -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/bdc5cd8872c898ccb123cf7ea29d7a7975f28364/recipe_engine/recipe_api.py#850 +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-source_manifest +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/README.recipes.md#recipe_modules-url +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8b75d5d75414bb2756bcf0b5188918887da8db20/recipe_engine/recipe_api.py#850 diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json index be411ad42..4a388777d 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json @@ -290,7 +290,7 @@ "", "Traceback (most recent call last):", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", - " raw_result = recipe_obj.run_steps(api, engine)", + " recipe_obj.run_steps(api, engine)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps", " properties_def, api=api)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json index 927909739..ed7697182 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json @@ -290,7 +290,7 @@ "", "Traceback (most recent call last):", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", - " raw_result = recipe_obj.run_steps(api, engine)", + " recipe_obj.run_steps(api, engine)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps", " properties_def, api=api)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", diff --git a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json index 400a15985..9fc108063 100644 --- a/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +++ b/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json @@ -290,7 +290,7 @@ "", "Traceback (most recent call last):", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", - " raw_result = recipe_obj.run_steps(api, engine)", + " recipe_obj.run_steps(api, engine)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", in run_steps", " properties_def, api=api)", " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties",