Target macOS 15 or 26 on CI and Try Mac builders To facilitate upgrading the OS on the bots. Bug: b/493610839 Change-Id: Iabc35ce2e98d4e218cd061b5014311108b4abdc8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7700359 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index c670e30..5dd1889 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -2275,7 +2275,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -2977,7 +2977,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.ci" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -6923,7 +6923,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -7094,7 +7094,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -8527,7 +8527,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -8693,7 +8693,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -8859,7 +8859,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -9025,7 +9025,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -9191,7 +9191,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" @@ -9357,7 +9357,7 @@ swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" dimensions: "cpu:arm64" - dimensions: "os:Mac-15" + dimensions: "os:Mac-15|Mac-26" dimensions: "pool:luci.chromium.gpu.try" exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
diff --git a/infra/config/main.star b/infra/config/main.star index 3b0aafb..9094a66 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -119,7 +119,7 @@ chromium_luci.configure_builders( os_dimension_overrides = { os.LINUX_DEFAULT: os.LINUX_JAMMY, - os.MAC_DEFAULT: os.MAC_15, + os.MAC_DEFAULT: "Mac-15|Mac-26", os.WINDOWS_DEFAULT: os.WINDOWS_10, }, )