Skip to content

Commit 3b2dd42

Browse files
aignasrickeylev
andauthored
ci: switch our jobs to mac arm64 (bazel-contrib#3426)
The arm64 macs have been in the wild for a while and it makes more sense to test against that platform instead of the Intel macs that very few people in our user-base are using. At the same time clarify the supported platforms. --------- Co-authored-by: Richard Levasseur <[email protected]>
1 parent 23397d5 commit 3b2dd42

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

.bazelci/presubmit.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ tasks:
159159
<<: *reusable_config
160160
<<: *common_workspace_flags
161161
name: "Default: Mac, workspace"
162-
platform: macos
162+
platform: macos_arm64
163163
windows_workspace:
164164
<<: *reusable_config
165165
<<: *common_workspace_flags
@@ -190,10 +190,10 @@ tasks:
190190
<<: *reusable_config
191191
name: "Default: Debian"
192192
platform: debian11
193-
macos:
193+
macos_arm64:
194194
<<: *reusable_config
195195
name: "Default: MacOS"
196-
platform: macos
196+
platform: macos_arm64
197197
windows:
198198
<<: *reusable_config
199199
name: "Default: Windows"
@@ -254,7 +254,7 @@ tasks:
254254
<<: *common_workspace_flags
255255
name: "examples/build_file_generation: macOS, workspace"
256256
working_directory: examples/build_file_generation
257-
platform: macos
257+
platform: macos_arm64
258258
integration_test_build_file_generation_windows_workspace:
259259
<<: *reusable_build_test_all
260260
<<: *common_workspace_flags
@@ -305,14 +305,14 @@ tasks:
305305
<<: *coverage_targets_example_bzlmod
306306
name: "examples/bzlmod: macOS"
307307
working_directory: examples/bzlmod
308-
platform: macos
308+
platform: macos_arm64
309309
bazel: 7.x
310310
integration_test_bzlmod_macos_upcoming:
311311
<<: *reusable_build_test_all
312312
<<: *coverage_targets_example_bzlmod
313313
name: "examples/bzlmod: macOS, upcoming Bazel"
314314
working_directory: examples/bzlmod
315-
platform: macos
315+
platform: macos_arm64
316316
bazel: last_rc
317317
integration_test_bzlmod_windows:
318318
<<: *reusable_build_test_all
@@ -362,7 +362,7 @@ tasks:
362362
<<: *coverage_targets_example_bzlmod_build_file_generation
363363
name: "gazelle/examples/bzlmod_build_file_generation: MacOS"
364364
working_directory: gazelle/examples/bzlmod_build_file_generation
365-
platform: macos
365+
platform: macos_arm64
366366
integration_test_bzlmod_build_file_generation_windows:
367367
<<: *reusable_build_test_all
368368
# coverage is not supported on Windows
@@ -390,7 +390,7 @@ tasks:
390390
<<: *coverage_targets_example_multi_python
391391
name: "examples/multi_python_versions: MacOS, workspace"
392392
working_directory: examples/multi_python_versions
393-
platform: macos
393+
platform: macos_arm64
394394
integration_test_multi_python_versions_windows_workspace:
395395
<<: *reusable_build_test_all
396396
<<: *common_workspace_flags
@@ -427,7 +427,7 @@ tasks:
427427
<<: *reusable_build_test_all
428428
name: "examples/pip_parse: MacOS"
429429
working_directory: examples/pip_parse
430-
platform: macos
430+
platform: macos_arm64
431431
integration_test_pip_parse_windows:
432432
<<: *reusable_build_test_all
433433
name: "examples/pip_parse: Windows"
@@ -458,7 +458,7 @@ tasks:
458458
<<: *common_workspace_flags
459459
name: "examples/pip_parse_vendored: MacOS"
460460
working_directory: examples/pip_parse_vendored
461-
platform: macos
461+
platform: macos_arm64
462462
# We don't run pip_parse_vendored under Windows as the file checked in is
463463
# generated from a repository rule containing OS-specific rendered paths.
464464

@@ -481,7 +481,7 @@ tasks:
481481
<<: *common_workspace_flags
482482
name: "examples/py_proto_library: MacOS, workspace"
483483
working_directory: examples/py_proto_library
484-
platform: macos
484+
platform: macos_arm64
485485
integration_test_py_proto_library_windows_workspace:
486486
<<: *reusable_build_test_all
487487
<<: *common_workspace_flags
@@ -506,7 +506,7 @@ tasks:
506506
<<: *common_workspace_flags
507507
name: "examples/pip_repository_annotations: macOS, workspace"
508508
working_directory: examples/pip_repository_annotations
509-
platform: macos
509+
platform: macos_arm64
510510
integration_test_pip_repository_annotations_windows_workspace:
511511
<<: *reusable_build_test_all
512512
<<: *common_workspace_flags
@@ -528,7 +528,7 @@ tasks:
528528
integration_test_bazelinbazel_macos:
529529
<<: *common_bazelinbazel_config
530530
name: "tests/integration bazel-in-bazel: macOS (subset)"
531-
platform: macos
531+
platform: macos_arm64
532532
build_targets: ["//tests/integration:local_toolchains_test_bazel_self"]
533533
test_targets: ["//tests/integration:local_toolchains_test_bazel_self"]
534534
# The bazelinbazel tests were disabled on Windows to save CI jobs slots, and
@@ -581,7 +581,7 @@ tasks:
581581
<<: *reusable_build_test_all
582582
name: "compile_pip_requirements: MacOS"
583583
working_directory: tests/integration/compile_pip_requirements
584-
platform: macos
584+
platform: macos_arm64
585585
shell_commands:
586586
# Make a change to the locked requirements and then assert that //:requirements.update does the
587587
# right thing.
@@ -614,7 +614,6 @@ tasks:
614614
- "bazel run //:os_specific_requirements.update"
615615
- "git diff --exit-code"
616616

617-
618617
integration_compile_pip_requirements_test_from_external_repo_ubuntu_min_workspace:
619618
<<: *minimum_supported_version
620619
<<: *common_workspace_flags_min_bazel
@@ -650,7 +649,7 @@ tasks:
650649
integration_compile_pip_requirements_test_from_external_repo_macos:
651650
name: "compile_pip_requirements_test_from_external_repo: macOS"
652651
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
653-
platform: macos
652+
platform: macos_arm64
654653
shell_commands:
655654
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
656655
- "bazel test @compile_pip_requirements//..."

docs/support.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ are Linux, Mac, and Windows.
6161

6262
In order to better describe different support levels, the following acts as a rough
6363
guideline for different platform tiers:
64-
* Tier 0 - The platforms that our CI runs on: `linux_x86_64`, `osx_x86_64`, `RBE linux_x86_64`.
65-
* Tier 1 - The platforms that are similar enough to what the CI runs on: `linux_aarch64`, `osx_arm64`.
64+
* Tier 0 - The platforms that our CI runs on: `linux_x86_64`, `osx_arm64`, `RBE linux_x86_64`.
65+
* Tier 1 - The platforms that are similar enough to what the CI runs on: `linux_aarch64`,
66+
`osx_x86_64`.
6667
What is more, `windows_x86_64` is in this list, as we run tests in CI, but
6768
developing for Windows is more challenging, and features may come later to
6869
this platform.

tests/integration/local_toolchains/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ pbs_archive(
4141
name = "pbs_runtime",
4242
sha256 = {
4343
"linux": "0a01bad99fd4a165a11335c29eb43015dfdb8bd5ba8e305538ebb54f3bf3146d",
44-
"mac os x": "4fb42ffc8aad2a42ca7646715b8926bc6b2e0d31f13d2fec25943dc236a6fd60",
44+
"mac os x": "7f5ec658219bdb1d1142c6abab89680322166c78350a017fb0af3c869dceee41",
4545
"windows": "005cb2abf4cfa4aaa48fb10ce4e33fe4335ea4d1f55202dbe4e20c852e45e0f9",
4646
},
4747
urls = {
4848
"linux": "https://github.com/astral-sh/python-build-standalone/releases/download/20250918/cpython-3.13.7+20250918-x86_64-unknown-linux-gnu-install_only.tar.gz",
49-
"mac os x": "https://github.com/astral-sh/python-build-standalone/releases/download/20250918/cpython-3.13.7+20250918-x86_64-apple-darwin-install_only.tar.gz",
49+
"mac os x": "https://github.com/astral-sh/python-build-standalone/releases/download/20250918/cpython-3.13.7+20250918-aarch64-apple-darwin-install_only.tar.gz",
5050
"windows server 2022": "https://github.com/astral-sh/python-build-standalone/releases/download/20250918/cpython-3.13.7+20250918-x86_64-pc-windows-msvc-install_only.tar.gz",
5151
},
5252
)

0 commit comments

Comments
 (0)