[infra] Update XCode version
This should hopefully address the LTO failure we saw on bots.
Change-Id: Iad82b8a273e9511e1ff478f46c51b93f8161c497
Reviewed-on: https://gn-review.googlesource.com/c/3880
Reviewed-by: Petr Hosek <phosek@google.com>
diff --git a/infra/recipe_modules/macos_sdk/__init__.py b/infra/recipe_modules/macos_sdk/__init__.py
index 2fe9d51..f749bfd 100644
--- a/infra/recipe_modules/macos_sdk/__init__.py
+++ b/infra/recipe_modules/macos_sdk/__init__.py
@@ -34,11 +34,11 @@
),
default={
'sdk_version':
- '9c40b',
+ '10b61',
'tool_package':
'infra/tools/mac_toolchain/${platform}',
'tool_version':
- 'git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a',
+ 'git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e',
},
)
}
diff --git a/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json b/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json
index 4c42f24..e5a7fc0 100644
--- a/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json
+++ b/infra/recipe_modules/macos_sdk/examples/full.expected/mac.json
@@ -6,7 +6,7 @@
"-root",
"[CACHE]/macos_sdk",
"-ensure-file",
- "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
+ "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e",
"-json-output",
"/path/to/tmp/json"
],
@@ -17,7 +17,7 @@
"@@@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:796\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/${platform}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -33,7 +33,7 @@
"-kind",
"mac",
"-xcode-version",
- "9c40b",
+ "10b61",
"-output-dir",
"[CACHE]/macos_sdk/XCode.app"
],
diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json
index ff804dd..155a77e 100644
--- a/infra/recipes/gn.expected/ci_mac.json
+++ b/infra/recipes/gn.expected/ci_mac.json
@@ -81,7 +81,7 @@
"-root",
"[CACHE]/macos_sdk",
"-ensure-file",
- "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
+ "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e",
"-json-output",
"/path/to/tmp/json"
],
@@ -92,7 +92,7 @@
"@@@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:796\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/${platform}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -108,7 +108,7 @@
"-kind",
"mac",
"-xcode-version",
- "9c40b",
+ "10b61",
"-output-dir",
"[CACHE]/macos_sdk/XCode.app"
],
diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json
index 85a4b13..fe4105c 100644
--- a/infra/recipes/gn.expected/cq_mac.json
+++ b/infra/recipes/gn.expected/cq_mac.json
@@ -108,7 +108,7 @@
"-root",
"[CACHE]/macos_sdk",
"-ensure-file",
- "infra/tools/mac_toolchain/${platform} git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a",
+ "infra/tools/mac_toolchain/${platform} git_revision:434f5462a77e7103f9d610fa5cabc426bb21502e",
"-json-output",
"/path/to/tmp/json"
],
@@ -119,7 +119,7 @@
"@@@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:796\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:434\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/${platform}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -135,7 +135,7 @@
"-kind",
"mac",
"-xcode-version",
- "9c40b",
+ "10b61",
"-output-dir",
"[CACHE]/macos_sdk/XCode.app"
],