From fcdb428dee37571ab1404185686681edd8f9561e Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Mon, 20 May 2019 21:22:09 +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/eeac8fccee349f073b6244a1032d083555b803ec Redact line numbers for traceback frames which originate outside the (iannucci@chromium.org) R=recipe-roller@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Iadda2159e026ed5e9e411dc4ecec2ff9cd36da32 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1620813 Commit-Queue: Recipe Roller 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 | 8 ++--- .../examples/full.expected/pkg_bad_mode.json | 8 ++--- .../full.expected/pkg_bad_verfile.json | 8 ++--- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 70add15fe1..ea01700ce7 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "5619081599b072acce6072da76aab28097a07686", + "revision": "eeac8fccee349f073b6244a1032d083555b803ec", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 6a2296e226..2ed290c431 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -997,19 +997,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/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-source_manifest -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/README.recipes.md#recipe_modules-url -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5619081599b072acce6072da76aab28097a07686/recipe_engine/recipe_api.py#836 +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-source_manifest +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/README.recipes.md#recipe_modules-url +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/eeac8fccee349f073b6244a1032d083555b803ec/recipe_engine/recipe_api.py#836 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 40fc5fa132..f6b077d898 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 @@ -289,13 +289,13 @@ "The recipe has crashed at point 'Uncaught exception'!", "", "Traceback (most recent call last):", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", " raw_result = recipe_obj.run_steps(api, engine)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 681, in run_steps", + " 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\", line 89, in invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", " arg_names, **additional_args)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties", " return callable_obj(*props, **additional_args)", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 70, in RunSteps", " pkg.add_file(api.path.abs_to_path(fullpath))", 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 147591eabe..9279097395 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 @@ -289,13 +289,13 @@ "The recipe has crashed at point 'Uncaught exception'!", "", "Traceback (most recent call last):", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", " raw_result = recipe_obj.run_steps(api, engine)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 681, in run_steps", + " 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\", line 89, in invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", " arg_names, **additional_args)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties", " return callable_obj(*props, **additional_args)", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 68, in RunSteps", " pkg = api.cipd.PackageDefinition('infra/fake-package', root, install_mode)", 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 9f5f3a7ef0..400a159850 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 @@ -289,13 +289,13 @@ "The recipe has crashed at point 'Uncaught exception'!", "", "Traceback (most recent call last):", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", line 375, in run_steps", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/engine.py\", in run_steps", " raw_result = recipe_obj.run_steps(api, engine)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/recipe_deps.py\", line 681, in run_steps", + " 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\", line 89, in invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in invoke_with_properties", " arg_names, **additional_args)", - " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", line 52, in _invoke_with_properties", + " File \"RECIPE_REPO[recipe_engine]/recipe_engine/internal/property_invoker.py\", in _invoke_with_properties", " return callable_obj(*props, **additional_args)", " File \"RECIPE_REPO[depot_tools]/recipes/recipe_modules/cipd/examples/full.py\", line 76, in RunSteps", " pkg.add_version_file(pth)",