Skip to content

Commit 80dbf1a

Browse files
authored
[macos] migrate to new runners (#377)
We no longer support x86 macos.
1 parent 14a2f65 commit 80dbf1a

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.bazelrc

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ build:remote_linux_x64 --host_platform=//platform/linux_x64
4141
build:remote_linux_x64 --platforms=//platform/linux_x64
4242
build:remote_linux_x64 --extra_toolchains=//platform/linux_x64:cc-toolchain
4343

44-
build:remote_macos_x64 --config=clang
45-
build:remote_macos_x64 --host_platform=//platform/macos_x64
46-
build:remote_macos_x64 --platforms=//platform/macos_x64
47-
build:remote_macos_x64 --macos_minimum_os=12
48-
build:remote_macos_x64 --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
49-
build:remote_macos_x64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
44+
build:remote_macos_arm64 --config=clang
45+
build:remote_macos_arm64 --host_platform=//platform/macos_arm64
46+
build:remote_macos_arm64 --platforms=//platform/macos_arm64
47+
build:remote_macos_arm64 --macos_minimum_os=14
48+
build:remote_macos_arm64 --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
49+
build:remote_macos_arm64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
5050

5151
build:remote_windows_x64 --host_platform=//platform/windows_x64
5252
build:remote_windows_x64 --platforms=//platform/windows_x64

.github/workflows/main.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ jobs:
3535
matrix:
3636
include:
3737
- os: macos
38-
arch: x64
39-
os_distribution: monterey
40-
os_version: "12"
41-
revision: 1ec247a1e93f4980098fc6bb2764bb093b37b3da
38+
arch: arm64
39+
os_distribution: sonoma
40+
os_version: "14"
41+
revision: dd17e52a1f04529abb97003e8093d356739980d7
4242
remote_execution: 'false'
4343

4444
- os: macos
45-
arch: x64
46-
os_distribution: monterey
47-
os_version: "12"
48-
revision: 1ec247a1e93f4980098fc6bb2764bb093b37b3da
45+
arch: arm64
46+
os_distribution: sonoma
47+
os_version: "14"
48+
revision: dd17e52a1f04529abb97003e8093d356739980d7
4949
remote_execution: 'true'
5050

5151
steps:
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)