From e0950f3cd2c6030c1d3f8a1bf40751dac70dee70 Mon Sep 17 00:00:00 2001 From: recipe-roller Date: Tue, 14 Apr 2020 22:32:41 +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 (recipe_engine) into this repository. Please review the expectation changes, and LGTM+CQ. recipe_engine: https://crrev.com/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4 (mohrr@google.com) [recipe_modules/cipd] Use -max-threads by default More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. R=recipe-roller@chromium.org Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: I7cf134b39e333cecc54868416a13248e104ca386 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2140624 Auto-Submit: Recipe Roller Commit-Queue: Robbie Iannucci Reviewed-by: Robbie Iannucci --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 36 +++++++++---------- .../full.expected/ancient_version.json | 2 ++ .../full.expected/automatic_version.json | 2 ++ .../full.expected/explicit_version.json | 2 ++ .../osx_sdk/examples/full.expected/mac.json | 2 ++ .../examples/full.expected/win.json | 2 ++ 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 0a0f809f2..90257063f 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -16,7 +16,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "42f6841b9e7d40b310e52425c71ca77dbe2ac1f2", + "revision": "fc83ebe9d2ed46c6b7147997a6987e0f42d962f4", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 8de3e2dc0..5c2de819f 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1063,21 +1063,21 @@ 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/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-commit_position -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-cq -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-runtime -[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-source_manifest -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-step -[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-url -[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/README.recipes.md#recipe_modules-version -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/42f6841b9e7d40b310e52425c71ca77dbe2ac1f2/recipe_engine/recipe_api.py#871 +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-commit_position +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-cq +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-runtime +[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-source_manifest +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-step +[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-url +[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/README.recipes.md#recipe_modules-version +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/fc83ebe9d2ed46c6b7147997a6987e0f42d962f4/recipe_engine/recipe_api.py#871 diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json index 24eb19b5d..958834a45 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json @@ -7,6 +7,8 @@ "[CACHE]/osx_sdk", "-ensure-file", "infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748", + "-max-threads", + "0", "-json-output", "/path/to/tmp/json" ], diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json index 5b2f4df46..fc809e9c3 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json @@ -7,6 +7,8 @@ "[CACHE]/osx_sdk", "-ensure-file", "infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748", + "-max-threads", + "0", "-json-output", "/path/to/tmp/json" ], diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json index 34650dc74..57c06b8e5 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json @@ -7,6 +7,8 @@ "[CACHE]/osx_sdk", "-ensure-file", "infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748", + "-max-threads", + "0", "-json-output", "/path/to/tmp/json" ], diff --git a/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json index 3257d8b22..b8834c09d 100644 --- a/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json +++ b/recipes/recipe_modules/osx_sdk/examples/full.expected/mac.json @@ -7,6 +7,8 @@ "[CACHE]/osx_sdk", "-ensure-file", "infra/tools/mac_toolchain/${platform} git_revision:9a1adc55bf4a1173784da3ba2f8cb06421606748", + "-max-threads", + "0", "-json-output", "/path/to/tmp/json" ], diff --git a/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json b/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json index aa5206efd..a9f859347 100644 --- a/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json +++ b/recipes/recipe_modules/windows_sdk/examples/full.expected/win.json @@ -7,6 +7,8 @@ "[CACHE]\\windows_sdk", "-ensure-file", "chrome_internal/third_party/sdk/windows uploaded:2018-06-13", + "-max-threads", + "0", "-json-output", "/path/to/tmp/json" ],