commit 27774a289a4e5eb22636b87268be5c2303bb6f0c
author David Benjamin <davidben@google.com> Tue Oct 07 10:52:14 2025 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 07 08:13:06 2025 -0700
tree a3526b3be049880491303c9a4e6d61a61c43cc8c
parent a269c926af2d1f683a4ac9609821a24134b86a3a

Bump the macOS versions on our CI to macOS 12 or 13

Arbitrarily picked two versions since we were previously picking a range
of two versions.

Fixed: 448848885
Bug: 448915963
Change-Id: I0ee6fd9d649b3265b73188ca49396ff48a39fa47
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/82647
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Lily Chen <chlily@google.com>
Commit-Queue: Lily Chen <chlily@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

infra/config/generated/cr-buildbucket.cfg

diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index f747bb3..cd79afb 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -281,7 +281,7 @@
       name: "ios64_compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "boringssl"
@@ -908,7 +908,7 @@
       name: "mac"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "boringssl"
@@ -993,7 +993,7 @@
       name: "mac_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "boringssl"
@@ -1021,7 +1021,7 @@
       name: "mac_small"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "boringssl"
@@ -1754,7 +1754,7 @@
       name: "ios64_compile"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "boringssl"
@@ -2156,7 +2156,7 @@
       name: "mac"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "boringssl"
@@ -2214,7 +2214,7 @@
       name: "mac_rel"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "boringssl"
@@ -2233,7 +2233,7 @@
       name: "mac_small"
       swarming_host: "chromium-swarm.appspot.com"
       dimensions: "cpu:x86-64"
-      dimensions: "os:Mac-10.15|Mac-11"
+      dimensions: "os:Mac-12|Mac-13"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "boringssl"

infra/config/main.star

diff --git a/infra/config/main.star b/infra/config/main.star
index c835cc0..1cba881 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -310,7 +310,8 @@
 
 MAC_X86_64_HOST = {
     "dimensions": {
-        "os": "Mac-10.15|Mac-11",
+        # macOS 12 or later is needed as of Go 1.25.
+        "os": "Mac-12|Mac-13",
         "cpu": "x86-64",
     },
     "caches": [swarming.cache("osx_sdk")],