mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Roll recipe dependencies (trivial).

Browse source 
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

The build that created this CL was
https://ci.chromium.org/b/8780098629700446385

recipe_engine:
b60bb0d221
  b60bb0d (nmulcahey@google.com)
      Revert "[recipes.py] Unset PYTHONPATH in case users have confli...

Please check the following references for more information:
- autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller
- rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback
- cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md

Use https://goo.gl/noib3a to file a bug.

R=denniskempin@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: I6d61129c3d7f62cc6fe403739a9cea2b4f48e64d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4568147
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Bot-Commit: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
This commit is contained in:
recipe-roller 2023-05-25 12:22:39 -07:00 committed by crosvm LUCI
parent 4caa4427f6
commit 44d9341061
3 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
infra/README.recipes.md
View file

@ -174,19 +174,19 @@ This recipe requires ambient luci authentication. To test locally run:
&mdash; **def [RunSteps](/infra/recipes/update_chromeos_merges.py#14)(api):** &mdash; **def [RunSteps](/infra/recipes/update_chromeos_merges.py#14)(api):**
[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-bot_update [depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-bot_update
[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-depot_tools [depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-depot_tools
[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-gclient [depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-gclient
[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-git [depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-git
[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/c83abb3247532d8e80d7ec7e8478a924b73d58c6/recipes/README.recipes.md#recipe_modules-gsutil [depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/89de8f642c99096770ae8f1ddeaa1aa03e59be07/recipes/README.recipes.md#recipe_modules-gsutil
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-buildbucket [recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-cipd [recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-context [recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-file [recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-json [recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-path [recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-platform [recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-properties [recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-raw_io [recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/README.recipes.md#recipe_modules-step [recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/README.recipes.md#recipe_modules-step
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/7f9b133838f1240a537916677161afd8129b234f/recipe_engine/recipe_api.py#886 [recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/b60bb0d221df01a41a175daf18632ec0525f20f1/recipe_engine/recipe_api.py#886

4
infra/config/recipes.cfg
View file

@ -20,12 +20,12 @@
"deps": { "deps": {
"depot_tools": { "depot_tools": {
"branch": "refs/heads/main", "branch": "refs/heads/main",
"revision": "c83abb3247532d8e80d7ec7e8478a924b73d58c6", "revision": "89de8f642c99096770ae8f1ddeaa1aa03e59be07",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
}, },
"recipe_engine": { "recipe_engine": {
"branch": "refs/heads/main", "branch": "refs/heads/main",
"revision": "7f9b133838f1240a537916677161afd8129b234f", "revision": "b60bb0d221df01a41a175daf18632ec0525f20f1",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
} }
}, },

5
infra/recipes.py
View file

@ -235,11 +235,6 @@ def main():
if not shutil.which(vpython): if not shutil.which(vpython):
return f'Required binary is not found on PATH: {vpython}' return f'Required binary is not found on PATH: {vpython}'
# We unset PYTHONPATH here in case the user has conflicting environmental
# things we don't want them to leak through into the recipe_engine which
# manages its environment entirely via vpython.
os.unsetenv("PYTHONPATH")
argv = ([ argv = ([
vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'), vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'),
] + args) ] + args)