Update Xcode and macOS version in bots This is reland of https://gn-review.googlesource.com/c/gn/+/19420. But with Xcode and installer update. I triggered led job to check behavior. $ led get-builder gn/try/mac | led edit-recipe-bundle | \ led edit -d os=Mac-13 | led launch https://ci.chromium.org/b/8708037911281008129 Bug: 433861937 Change-Id: I0c10a9381da955c5cd8ef822d446ed61f1b7b68d Reviewed-on: https://gn-review.googlesource.com/c/gn/+/19480 Commit-Queue: Takuto Ikuta <tikuta@google.com> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 51c0ff6..5862c76 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -32,7 +32,7 @@ name: "mac" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.ci" recipe { name: "gn" @@ -122,7 +122,7 @@ name: "mac" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-10.15" + dimensions: "os:Mac-11" dimensions: "pool:luci.flex.try" recipe { name: "gn"
diff --git a/infra/config/main.star b/infra/config/main.star index 0fb49df..8b269ef 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -120,7 +120,7 @@ ) ci_builder("linux", "Ubuntu-22.04") -ci_builder("mac", "Mac-10.15", caches = [swarming.cache("macos_sdk")]) +ci_builder("mac", "Mac-11", caches = [swarming.cache("macos_sdk")]) ci_builder("win", "Windows-10", caches = [swarming.cache("windows_sdk")]) luci.cq( @@ -197,5 +197,5 @@ ) try_builder("linux", "Ubuntu-22.04") -try_builder("mac", "Mac-10.15", caches = [swarming.cache("macos_sdk")]) +try_builder("mac", "Mac-11", caches = [swarming.cache("macos_sdk")]) try_builder("win", "Windows-10", caches = [swarming.cache("windows_sdk")])
diff --git a/infra/recipe_modules/macos_sdk/__init__.py b/infra/recipe_modules/macos_sdk/__init__.py index 56b6a94..52364a7 100644 --- a/infra/recipe_modules/macos_sdk/__init__.py +++ b/infra/recipe_modules/macos_sdk/__init__.py
@@ -33,12 +33,14 @@ tool_ver=Single(str), ), default={ + # Check macOS version used in CQ/CI and required version of Xcode. + # https://xcodereleases.com/ 'sdk_version': - '12B5025f', + '15C500b', # Xcode 15.2 'tool_package': 'infra/tools/mac_toolchain/${platform}', 'tool_version': - 'git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280', + 'git_revision:1b9e28e1cfc65541b83def4480835449b60188a1', }, ) }
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 58b1191..63d3ec7 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:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", + "infra/tools/mac_toolchain/${platform} git_revision:1b9e28e1cfc65541b83def4480835449b60188a1", "-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:e9b\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:1b9\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -35,7 +35,7 @@ "-kind", "mac", "-xcode-version", - "12b5025f", + "15c500b", "-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 e8d64e2..93c3f9c 100644 --- a/infra/recipes/gn.expected/ci_mac.json +++ b/infra/recipes/gn.expected/ci_mac.json
@@ -156,7 +156,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", + "infra/tools/mac_toolchain/${platform} git_revision:1b9e28e1cfc65541b83def4480835449b60188a1", "-max-threads", "0", "-json-output", @@ -181,7 +181,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:e9b\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:1b9\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -197,7 +197,7 @@ "-kind", "mac", "-xcode-version", - "12b5025f", + "15c500b", "-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 6263b81..a5ec5dc 100644 --- a/infra/recipes/gn.expected/cq_mac.json +++ b/infra/recipes/gn.expected/cq_mac.json
@@ -207,7 +207,7 @@ "-root", "[CACHE]/macos_sdk", "-ensure-file", - "infra/tools/mac_toolchain/${platform} git_revision:e9b1fe29fe21a1cd36428c43ea2aba244bd31280", + "infra/tools/mac_toolchain/${platform} git_revision:1b9e28e1cfc65541b83def4480835449b60188a1", "-max-threads", "0", "-json-output", @@ -232,7 +232,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:e9b\",@@@", + "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:1b9\",@@@", "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -248,7 +248,7 @@ "-kind", "mac", "-xcode-version", - "12b5025f", + "15c500b", "-output-dir", "[CACHE]/macos_sdk/XCode.app" ],