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.
Please review the expectation changes, and LGTM+CQ.
fuchsia:
https://fuchsia.googlesource.com/infra/recipes/+/b6f2853a70a378fb981e6ebc935b54e79e2af3f8
b6f2853 (nmulcahey@google.com)
[mac] Roll XCode to 12A7209
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Id0ba2d1fdbeb8d484ba92606fd981b726902ba3c
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/21080
Reviewed-by: Rob Mohr <mohrr@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 24cb62b..c4c1709 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -18,7 +18,7 @@
"deps": {
"fuchsia": {
"branch": "master",
- "revision": "fc210c4521aad4b7788960b1b6f2ad7e88d35f26",
+ "revision": "b6f2853a70a378fb981e6ebc935b54e79e2af3f8",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
diff --git a/recipe_modules/environment/tests/full.expected/with_cargo.json b/recipe_modules/environment/tests/full.expected/with_cargo.json
index 338fce7..400abb1 100644
--- a/recipe_modules/environment/tests/full.expected/with_cargo.json
+++ b/recipe_modules/environment/tests/full.expected/with_cargo.json
@@ -12,14 +12,14 @@
},
{
"cmd": [],
- "name": "environment.setup platform.ensure XCode 11c29",
+ "name": "environment.setup platform.ensure XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [],
- "name": "environment.setup platform.ensure XCode 11c29.install infra/tools/mac_toolchain",
+ "name": "environment.setup platform.ensure XCode 12a7209.install infra/tools/mac_toolchain",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -34,10 +34,10 @@
"ensure-directory",
"--mode",
"0777",
- "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Aaf9d7e0e0a44285a6830784b4b848223e7b3179f"
+ "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 11c29.install infra/tools/mac_toolchain.ensure package directory",
+ "name": "environment.setup platform.ensure XCode 12a7209.install infra/tools/mac_toolchain.ensure package directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -47,23 +47,23 @@
"cipd",
"ensure",
"-root",
- "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Aaf9d7e0e0a44285a6830784b4b848223e7b3179f",
+ "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280",
"-ensure-file",
- "infra/tools/mac_toolchain/${platform} git_revision:af9d7e0e0a44285a6830784b4b848223e7b3179f",
+ "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280",
"-max-threads",
"0",
"-json-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 11c29.install infra/tools/mac_toolchain.ensure_installed",
+ "name": "environment.setup platform.ensure XCode 12a7209.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:af9\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:e9b\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -74,17 +74,17 @@
},
{
"cmd": [
- "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Aaf9d7e0e0a44285a6830784b4b848223e7b3179f/mac_toolchain",
+ "[CACHE]/cipd/infra/tools/mac_toolchain/git_revision%3Ae9b1fe29fe21a1cd36428c43ea2aba244bd31280/mac_toolchain",
"install",
"-kind",
"mac",
"-xcode-version",
- "11c29",
+ "12a7209",
"-output-dir",
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 11c29.install XCode 11c29",
+ "name": "environment.setup platform.ensure XCode 12a7209.install XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -97,7 +97,7 @@
"[CACHE]/macos_sdk/XCode.app"
],
"infra_step": true,
- "name": "environment.setup platform.ensure XCode 11c29.select XCode 11c29",
+ "name": "environment.setup platform.ensure XCode 12a7209.select XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -260,7 +260,7 @@
},
{
"cmd": [],
- "name": "environment.setup python.setup virtualenv.ensure XCode 11c29",
+ "name": "environment.setup python.setup virtualenv.ensure XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -282,7 +282,7 @@
"PW_ROOT": "[START_DIR]/pigweed"
},
"infra_step": true,
- "name": "environment.setup python.setup virtualenv.ensure XCode 11c29.select XCode 11c29",
+ "name": "environment.setup python.setup virtualenv.ensure XCode 12a7209.select XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -361,7 +361,7 @@
},
{
"cmd": [],
- "name": "environment.setup python.install packages.ensure XCode 11c29",
+ "name": "environment.setup python.install packages.ensure XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -389,7 +389,7 @@
]
},
"infra_step": true,
- "name": "environment.setup python.install packages.ensure XCode 11c29.select XCode 11c29",
+ "name": "environment.setup python.install packages.ensure XCode 12a7209.select XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
@@ -512,7 +512,7 @@
},
{
"cmd": [],
- "name": "environment.setup cargo.ensure XCode 11c29",
+ "name": "environment.setup cargo.ensure XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
@@ -543,7 +543,7 @@
]
},
"infra_step": true,
- "name": "environment.setup cargo.ensure XCode 11c29.select XCode 11c29",
+ "name": "environment.setup cargo.ensure XCode 12a7209.select XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
]
@@ -614,7 +614,7 @@
},
{
"cmd": [],
- "name": "ensure XCode 11c29"
+ "name": "ensure XCode 12a7209"
},
{
"cmd": [
@@ -643,7 +643,7 @@
]
},
"infra_step": true,
- "name": "ensure XCode 11c29.select XCode 11c29",
+ "name": "ensure XCode 12a7209.select XCode 12a7209",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
