Skip to content

Commit c89d256

Browse files
authored
OND-1042: switch CI to use macOS 14 arm64 pool (#65)
1 parent 2f9234e commit c89d256

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

.bazelrc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ build:remote_linux_x64 --extra_toolchains=//platform/linux_x64:cc-toolchain
3030
build:remote_linux_x64 --host_platform=//platform/linux_x64
3131
build:remote_linux_x64 --platforms=//platform/linux_x64
3232

33-
build:remote_macos_x64 --extra_execution_platforms=//platform/macos_x64
34-
build:remote_macos_x64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
35-
build:remote_macos_x64 --host_platform=//platform/macos_x64
36-
build:remote_macos_x64 --macos_minimum_os=12
37-
build:remote_macos_x64 --platforms=//platform/macos_x64
33+
build:remote_macos_arm64 --extra_execution_platforms=//platform/macos_arm64
34+
build:remote_macos_arm64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
35+
build:remote_macos_arm64 --host_platform=//platform/macos_arm64
36+
build:remote_macos_arm64 --macos_minimum_os=14
37+
build:remote_macos_arm64 --platforms=//platform/macos_arm64
3838

3939
build:remote_windows_x64 --extra_execution_platforms=//platform/windows_x64
4040
build:remote_windows_x64 --extra_toolchains=//platform/windows_x64:cc-toolchain
@@ -50,7 +50,7 @@ build:engflow_common --incompatible_strict_action_env=true
5050
build:engflow_common --remote_timeout=600
5151
build:engflow_common --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
5252
build:engflow_common --grpc_keepalive_time=30s
53-
build:engflow_common --experimental_remote_cache_compression=true
53+
build:engflow_common --remote_cache_compression=true
5454
build:engflow_common --remote_download_minimal
5555

5656
build:engflow_bes --bes_backend=grpcs://opal.cluster.engflow.com

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
matrix:
7878
include:
7979
- os: "macos"
80-
arch: "x64"
80+
arch: "arm64"
8181
os_distribution: "sonoma"
8282
os_version: "14"
8383
revision: "dd17e52a1f04529abb97003e8093d356739980d7"

.github/workflows/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
matrix:
8383
include:
8484
- os: "macos"
85-
arch: "x64"
85+
arch: "arm64"
8686
os_distribution: "sonoma"
8787
os_version: "14"
8888
revision: "dd17e52a1f04529abb97003e8093d356739980d7"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package(default_visibility = ["//visibility:public"])
22

33
platform(
4-
name = "macos_x64",
4+
name = "macos_arm64",
55
constraint_values = [
66
"@platforms//os:macos",
7-
"@platforms//cpu:x86_64",
7+
"@platforms//cpu:arm64",
88
"@rules_go//go/toolchain:cgo_off",
99
],
1010
exec_properties = {
11-
"Pool": "macos_x64",
11+
"Pool": "macos_arm_m2",
1212
},
1313
)

0 commit comments

Comments
 (0)