Revert "Update macOS version to 13 used in CQ/CI" This reverts commit 4cfb717bbd5ecfcf63af3cb4487da5ea4777ef67. Reason for revert: This may cause https://ci.chromium.org/ui/p/gn/builders/try/mac/b8708389858891163537/overview Bug: 433861937 Original change's description: > Update macOS version to 13 used in CQ/CI > > Bug: 433861937 > Change-Id: I58f4ebb1534b591ac9c635883f5a2952dd8d2f2a > Reviewed-on: https://gn-review.googlesource.com/c/gn/+/19360 > Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> > Commit-Queue: Takuto Ikuta <tikuta@google.com> No-Try: true Bug: 433861937 Change-Id: If22129f7c7050fe6b6397d46de41c994449205b3 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/19420 Reviewed-by: David Turner <digit@google.com> Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index c951e77..01ab643 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-13" + dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" recipe { name: "gn" @@ -110,7 +110,7 @@ name: "mac" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" - dimensions: "os:Mac-13" + dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" recipe { name: "gn"
diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg index bb145a6..0462da7 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg
@@ -7,7 +7,7 @@ name: "gn" access: "group:all" lucicfg { - version: "1.45.6" + version: "1.45.3" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/infra/config/main.star b/infra/config/main.star index f435a6b..e988e49 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -98,7 +98,7 @@ ) ci_builder("linux", "Ubuntu-22.04") -ci_builder("mac", "Mac-13", caches = [swarming.cache("macos_sdk")]) +ci_builder("mac", "Mac-10.15", caches = [swarming.cache("macos_sdk")]) ci_builder("win", "Windows-10", caches = [swarming.cache("windows_sdk")]) luci.cq( @@ -153,5 +153,5 @@ ) try_builder("linux", "Ubuntu-22.04") -try_builder("mac", "Mac-13", caches = [swarming.cache("macos_sdk")]) +try_builder("mac", "Mac-10.15", caches = [swarming.cache("macos_sdk")]) try_builder("win", "Windows-10", caches = [swarming.cache("windows_sdk")])