[infra] Roll mac_toolchain to latest version On macOS 13+, newly extracted Xcode.app occasionally fails during the initial `xcodebuild -license accept` step in `mac_toolchain install` due to Gatekeeper / codesign verification killing the process with SIGKILL (`failed to accept new license: signal: killed`), e.g.: https://ci.chromium.org/ui/p/infra-internal/builders/prod/gn-builder-mac/1211/overview The previously pinned version of `mac_toolchain` (`1b9e28e1cfc6`) only retried installation when the error message contained "Xcode app is possibly corrupted" or "failed to pass gatekeeper check", which was only emitted on a 5-minute timeout and not when `acceptLicense` failed early. Roll `mac_toolchain` to the latest version (`3433dc5aff8c`), which wraps `acceptLicense` failures with "The downloaded Xcode app is possibly corrupted. Accepting license failed." so that automatic retry is triggered on transient Gatekeeper / license acceptance failures. Change-Id: I2d293d2b7c60d8947d33e4bd7d888f36fef87fd2 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/28020 Reviewed-by: Junji Watanabe <jwata@google.com> Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/infra/recipe_modules/macos_sdk/__init__.py b/infra/recipe_modules/macos_sdk/__init__.py index 52364a7..6cb5228 100644 --- a/infra/recipe_modules/macos_sdk/__init__.py +++ b/infra/recipe_modules/macos_sdk/__init__.py
@@ -40,7 +40,7 @@ 'tool_package': 'infra/tools/mac_toolchain/${platform}', 'tool_version': - 'git_revision:1b9e28e1cfc65541b83def4480835449b60188a1', + 'git_revision:3433dc5aff8ca9427b0e2958e0ac87cfc1fa6ffc', }, ) }
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 63d3ec7..bac4cf5 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:1b9e28e1cfc65541b83def4480835449b60188a1", + "infra/tools/mac_toolchain/${platform} git_revision:3433dc5aff8ca9427b0e2958e0ac87cfc1fa6ffc", "-max-threads", "0", "-json-output", @@ -19,7 +19,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:1b9\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:343\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json index 06e92b8..da247df 100644 --- a/infra/recipes/gn.expected/ci_mac.json +++ b/infra/recipes/gn.expected/ci_mac.json
@@ -220,7 +220,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:1b9e28e1cfc65541b83def4480835449b60188a1", + "infra/tools/mac_toolchain/${platform} git_revision:3433dc5aff8ca9427b0e2958e0ac87cfc1fa6ffc", "-max-threads", "0", "-json-output", @@ -245,7 +245,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:1b9\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:343\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json index 654697b..402ce4f 100644 --- a/infra/recipes/gn.expected/cq_mac.json +++ b/infra/recipes/gn.expected/cq_mac.json
@@ -271,7 +271,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:1b9e28e1cfc65541b83def4480835449b60188a1", + "infra/tools/mac_toolchain/${platform} git_revision:3433dc5aff8ca9427b0e2958e0ac87cfc1fa6ffc", "-max-threads", "0", "-json-output", @@ -296,7 +296,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:1b9\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:343\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@",