Skip to content

C
Chromium_Depot_tools
Commit 2eba5297 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by LUCI CQ
Browse files
Options

recipe: import engine_types instead of types from recipe_engine 

Motivation: https://crrev.com/c/3050650

Bug: 1227763
Change-Id: I2e7ce3a8a5652959bdc68f4b3cd3a783d0424c36
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3055154
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Auto-Submit: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@google.com>
parent b992c425
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
infra/config/recipes.cfg
View file @ 2eba5297
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"deps": { "deps": {
"recipe_engine": { "recipe_engine": {
"branch": "refs/heads/main", "branch": "refs/heads/main",
"revision": "32560ddd7db093bbef5b78a72e876d495db4dc8f", "revision": "60858d08ac9fef6662887e409547f5430ec5d75f",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
} }
}, },
......
recipes/README.recipes.md
View file @ 2eba5297
...@@ -1137,23 +1137,23 @@ Move things around in a loop! ...@@ -1137,23 +1137,23 @@ Move things around in a loop!
&mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):** &mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-assertions [recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-assertions
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-buildbucket [recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-cipd [recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-commit_position [recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-commit_position
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-context [recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-cq [recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-cq
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-file [recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-json [recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-milo [recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-milo
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-path [recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-platform [recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-properties [recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-python [recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-raw_io [recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-resultdb [recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-resultdb
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-runtime [recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-step [recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-url [recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-url
[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/README.recipes.md#recipe_modules-version [recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/README.recipes.md#recipe_modules-version
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/32560ddd7db093bbef5b78a72e876d495db4dc8f/recipe_engine/recipe_api.py#881 [recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/60858d08ac9fef6662887e409547f5430ec5d75f/recipe_engine/recipe_api.py#881
recipes/recipe_modules/bot_update/examples/full.py
View file @ 2eba5297
...@@ -15,7 +15,7 @@ DEPS = [ ...@@ -15,7 +15,7 @@ DEPS = [
'recipe_engine/runtime', 'recipe_engine/runtime',
] ]
from recipe_engine import types from recipe_engine import engine_types
from RECIPE_MODULES.depot_tools import gclient from RECIPE_MODULES.depot_tools import gclient
from PB.go.chromium.org.luci.buildbucket.proto.build import Build from PB.go.chromium.org.luci.buildbucket.proto.build import Build
...@@ -64,7 +64,7 @@ def RunSteps(api): ...@@ -64,7 +64,7 @@ def RunSteps(api):
set_output_commit = api.properties.get('set_output_commit', True) set_output_commit = api.properties.get('set_output_commit', True)
step_test_data = None step_test_data = None
bot_update_output = types.thaw(api.properties.get('bot_update_output')) bot_update_output = engine_types.thaw(api.properties.get('bot_update_output'))
if bot_update_output: if bot_update_output:
step_test_data = lambda: api.json.test_api.output(bot_update_output) step_test_data = lambda: api.json.test_api.output(bot_update_output)
bot_update_step = api.bot_update.ensure_checkout( bot_update_step = api.bot_update.ensure_checkout(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment