From b7b3f163b07b47dd244349630a5b2eb13e4e1f58 Mon Sep 17 00:00:00 2001
From: Jay Conrod <jay@engflow.com>
Date: Wed, 8 Jan 2025 09:56:57 -0800
Subject: [PATCH] OND-1042: switch CI to use macOS 14 arm64 pool

---
 .bazelrc                                  | 12 ++++++------
 .github/workflows/main.yml                |  2 +-
 .github/workflows/presubmit.yml           |  2 +-
 platform/{macos_x64 => macos_arm64}/BUILD |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename platform/{macos_x64 => macos_arm64}/BUILD (69%)

diff --git a/.bazelrc b/.bazelrc
index d2189a6..2c33ecf 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -30,11 +30,11 @@ build:remote_linux_x64 --extra_toolchains=//platform/linux_x64:cc-toolchain
 build:remote_linux_x64 --host_platform=//platform/linux_x64
 build:remote_linux_x64 --platforms=//platform/linux_x64
 
-build:remote_macos_x64 --extra_execution_platforms=//platform/macos_x64
-build:remote_macos_x64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-build:remote_macos_x64 --host_platform=//platform/macos_x64
-build:remote_macos_x64 --macos_minimum_os=12
-build:remote_macos_x64 --platforms=//platform/macos_x64
+build:remote_macos_arm64 --extra_execution_platforms=//platform/macos_arm64
+build:remote_macos_arm64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+build:remote_macos_arm64 --host_platform=//platform/macos_arm64
+build:remote_macos_arm64 --macos_minimum_os=14
+build:remote_macos_arm64 --platforms=//platform/macos_arm64
 
 build:remote_windows_x64 --extra_execution_platforms=//platform/windows_x64
 build:remote_windows_x64 --extra_toolchains=//platform/windows_x64:cc-toolchain
@@ -50,7 +50,7 @@ build:engflow_common --incompatible_strict_action_env=true
 build:engflow_common --remote_timeout=600
 build:engflow_common --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 build:engflow_common --grpc_keepalive_time=30s
-build:engflow_common --experimental_remote_cache_compression=true
+build:engflow_common --remote_cache_compression=true
 build:engflow_common --remote_download_minimal
 
 build:engflow_bes --bes_backend=grpcs://opal.cluster.engflow.com
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a712abe..3d2885b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -77,7 +77,7 @@ jobs:
       matrix:
         include:
           - os: "macos"
-            arch: "x64"
+            arch: "arm64"
             os_distribution: "sonoma"
             os_version: "14"
             revision: "dd17e52a1f04529abb97003e8093d356739980d7"
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 3867441..960e8f4 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -82,7 +82,7 @@ jobs:
       matrix:
         include:
           - os: "macos"
-            arch: "x64"
+            arch: "arm64"
             os_distribution: "sonoma"
             os_version: "14"
             revision: "dd17e52a1f04529abb97003e8093d356739980d7"
diff --git a/platform/macos_x64/BUILD b/platform/macos_arm64/BUILD
similarity index 69%
rename from platform/macos_x64/BUILD
rename to platform/macos_arm64/BUILD
index f32f92d..96c8aa8 100644
--- a/platform/macos_x64/BUILD
+++ b/platform/macos_arm64/BUILD
@@ -1,13 +1,13 @@
 package(default_visibility = ["//visibility:public"])
 
 platform(
-    name = "macos_x64",
+    name = "macos_arm64",
     constraint_values = [
         "@platforms//os:macos",
-        "@platforms//cpu:x86_64",
+        "@platforms//cpu:arm64",
         "@rules_go//go/toolchain:cgo_off",
     ],
     exec_properties = {
-        "Pool": "macos_x64",
+        "Pool": "macos_arm_m2",
     },
 )