Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (fuchsia) into this repository.
The build that created this CL was
https://ci.chromium.org/b/8780575256964275377
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/040f5daee4163843638924be7edc0127e62904bd
040f5da (nmulcahey@google.com)
[mac] Update mac toolchain to 12D4e
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=mohrr@google.com, tpudlik@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ie66b3ba1fb0c2b7a01066d9737300aa7532f772f
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/148040
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 742d7ce..cdcc6cd 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,7 +17,7 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "2d7f2689e0c0cdf38eeca7dea9da0aee841d9fa0",
+ "revision": "040f5daee4163843638924be7edc0127e62904bd",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index 24e2639..eeb5153 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -22,14 +22,14 @@
},
{
"cmd": [],
- "name": "environment.setup platform.ensure XCode 12b5025f",
+ "name": "environment.setup platform.ensure XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [],
- "name": "environment.setup platform.ensure XCode 12b5025f.install infra/tools/mac_toolchain",
+ "name": "environment.setup platform.ensure XCode 12d4e.install infra/tools/mac_toolchain",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -44,10 +44,10 @@
"ensure-directory",
"--mode",
"0777",
- "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280"
+ "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae0190056f9092d1d5c7fe238650e9ebdc41e7677"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 12b5025f.install infra/tools/mac_toolchain.ensure package directory",
+ "name": "environment.setup platform.ensure XCode 12d4e.install infra/tools/mac_toolchain.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -57,23 +57,23 @@
"cipd",
"ensure",
"-root",
- "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280",
+ "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae0190056f9092d1d5c7fe238650e9ebdc41e7677",
"-ensure-file",
- "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280",
+ "infra/tools/mac_toolchain/${platform} git_revision:e0190056f9092d1d5c7fe238650e9ebdc41e7677",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 12b5025f.install infra/tools/mac_toolchain.ensure_installed",
+ "name": "environment.setup platform.ensure XCode 12d4e.install infra/tools/mac_toolchain.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e9b\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e01\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -84,17 +84,17 @@
},
{
"cmd": [
- "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280/mac_toolchain",
+ "[START_DIR]/cipd_tool/infra/tools/mac_toolchain/git_revision%3Ae0190056f9092d1d5c7fe238650e9ebdc41e7677/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
- "12b5025f",
+ "12d4e",
"-output-dir",
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 12b5025f.install XCode 12b5025f",
+ "name": "environment.setup platform.ensure XCode 12d4e.install XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -107,7 +107,7 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 12b5025f.select XCode 12b5025f",
+ "name": "environment.setup platform.ensure XCode 12d4e.select XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -120,7 +120,7 @@
"--show-sdk-path"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 12b5025f.xcrun",
+ "name": "environment.setup platform.ensure XCode 12d4e.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@",
@@ -203,7 +203,7 @@
},
{
"cmd": [],
- "name": "environment.run pw_env_setup.ensure XCode 12b5025f",
+ "name": "environment.run pw_env_setup.ensure XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -235,7 +235,7 @@
"TRIGGERING_CHANGES_JSON": null
},
"infra_step": true,
- "name": "environment.run pw_env_setup.ensure XCode 12b5025f.select XCode 12b5025f",
+ "name": "environment.run pw_env_setup.ensure XCode 12d4e.select XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -267,7 +267,7 @@
"TRIGGERING_CHANGES_JSON": null
},
"infra_step": true,
- "name": "environment.run pw_env_setup.ensure XCode 12b5025f.xcrun",
+ "name": "environment.run pw_env_setup.ensure XCode 12d4e.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@",
@@ -704,7 +704,7 @@
},
{
"cmd": [],
- "name": "environment.ensure XCode 12b5025f",
+ "name": "environment.ensure XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -747,7 +747,7 @@
]
},
"infra_step": true,
- "name": "environment.ensure XCode 12b5025f.select XCode 12b5025f",
+ "name": "environment.ensure XCode 12d4e.select XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -790,7 +790,7 @@
]
},
"infra_step": true,
- "name": "environment.ensure XCode 12b5025f.xcrun",
+ "name": "environment.ensure XCode 12d4e.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@",
@@ -883,7 +883,7 @@
},
{
"cmd": [],
- "name": "ensure XCode 12b5025f"
+ "name": "ensure XCode 12d4e"
},
{
"cmd": [
@@ -923,7 +923,7 @@
]
},
"infra_step": true,
- "name": "ensure XCode 12b5025f.select XCode 12b5025f",
+ "name": "ensure XCode 12d4e.select XCode 12d4e",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
@@ -966,7 +966,7 @@
]
},
"infra_step": true,
- "name": "ensure XCode 12b5025f.xcrun",
+ "name": "ensure XCode 12d4e.xcrun",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@",
