diff --git a/.bazelrc b/.bazelrc index f4dc47b4..705d2638 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3d324a2d..8c85a537 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: 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 f32f92d9..96c8aa8d 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", }, )