Skip to content

Commit

Permalink
[macos] migrate to new runners (#377)
Browse files Browse the repository at this point in the history
We no longer support x86 macos.
  • Loading branch information
luke-flow authored Jan 16, 2025
1 parent 14a2f65 commit 80dbf1a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ build:remote_linux_x64 --host_platform=//platform/linux_x64
build:remote_linux_x64 --platforms=//platform/linux_x64
build:remote_linux_x64 --extra_toolchains=//platform/linux_x64:cc-toolchain

build:remote_macos_x64 --config=clang
build:remote_macos_x64 --host_platform=//platform/macos_x64
build:remote_macos_x64 --platforms=//platform/macos_x64
build:remote_macos_x64 --macos_minimum_os=12
build:remote_macos_x64 --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote_macos_x64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote_macos_arm64 --config=clang
build:remote_macos_arm64 --host_platform=//platform/macos_arm64
build:remote_macos_arm64 --platforms=//platform/macos_arm64
build:remote_macos_arm64 --macos_minimum_os=14
build:remote_macos_arm64 --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build:remote_macos_arm64 --host_action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1

build:remote_windows_x64 --host_platform=//platform/windows_x64
build:remote_windows_x64 --platforms=//platform/windows_x64
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ jobs:
matrix:
include:
- os: macos
arch: x64
os_distribution: monterey
os_version: "12"
revision: 1ec247a1e93f4980098fc6bb2764bb093b37b3da
arch: arm64
os_distribution: sonoma
os_version: "14"
revision: dd17e52a1f04529abb97003e8093d356739980d7
remote_execution: 'false'

- os: macos
arch: x64
os_distribution: monterey
os_version: "12"
revision: 1ec247a1e93f4980098fc6bb2764bb093b37b3da
arch: arm64
os_distribution: sonoma
os_version: "14"
revision: dd17e52a1f04529abb97003e8093d356739980d7
remote_execution: 'true'

steps:
Expand Down
6 changes: 3 additions & 3 deletions platform/macos_x64/BUILD → platform/macos_arm64/BUILD
Original file line number Diff line number Diff line change
@@ -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",
},
)

0 comments on commit 80dbf1a

Please sign in to comment.