Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jayconrod merged 1 commit into from
Jan 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
matrix:
include:
- os: "macos"
arch: "x64"
arch: "arm64"
os_distribution: "sonoma"
os_version: "14"
revision: "dd17e52a1f04529abb97003e8093d356739980d7"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
matrix:
include:
- os: "macos"
arch: "x64"
arch: "arm64"
os_distribution: "sonoma"
os_version: "14"
revision: "dd17e52a1f04529abb97003e8093d356739980d7"
Expand Down
6 changes: 3 additions & 3 deletions platform/macos_x64/BUILD → platform/macos_arm64/BUILD
View file
Open in desktop
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",
},
)