OND-1042: switch CI to use macOS 14 arm64 pool

EngFlow · Jan 8, 2025 · b7b3f16 · b7b3f16
1 parent 2f9234e
commit b7b3f16
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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 → platform/macos_arm64/BUILD b/platform/macos_x64/BUILD → 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",
     },
 )