Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
32 changes: 16 additions & 16 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ tasks:
<<: *reusable_config
<<: *common_workspace_flags
name: "Default: Mac, workspace"
platform: macos
platform: macos_arm64
windows_workspace:
<<: *reusable_config
<<: *common_workspace_flags
Expand Down Expand Up @@ -190,10 +190,10 @@ tasks:
<<: *reusable_config
name: "Default: Debian"
platform: debian11
macos:
macos_arm64:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This task key was updated to macos_arm64, which is great for clarity. However, other macOS task keys in this file were not renamed (e.g., integration_test_bzlmod_macos), creating an inconsistency. For better maintainability, consider renaming all macOS task keys to reflect the architecture change in a follow-up PR.

<<: *reusable_config
name: "Default: MacOS"
platform: macos
platform: macos_arm64
windows:
<<: *reusable_config
name: "Default: Windows"
Expand Down Expand Up @@ -254,7 +254,7 @@ tasks:
<<: *common_workspace_flags
name: "examples/build_file_generation: macOS, workspace"
working_directory: examples/build_file_generation
platform: macos
platform: macos_arm64
integration_test_build_file_generation_windows_workspace:
<<: *reusable_build_test_all
<<: *common_workspace_flags
Expand Down Expand Up @@ -305,14 +305,14 @@ tasks:
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: macOS"
working_directory: examples/bzlmod
platform: macos
platform: macos_arm64
bazel: 7.x
integration_test_bzlmod_macos_upcoming:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: macOS, upcoming Bazel"
working_directory: examples/bzlmod
platform: macos
platform: macos_arm64
bazel: last_rc
integration_test_bzlmod_windows:
<<: *reusable_build_test_all
Expand Down Expand Up @@ -362,7 +362,7 @@ tasks:
<<: *coverage_targets_example_bzlmod_build_file_generation
name: "gazelle/examples/bzlmod_build_file_generation: MacOS"
working_directory: gazelle/examples/bzlmod_build_file_generation
platform: macos
platform: macos_arm64
integration_test_bzlmod_build_file_generation_windows:
<<: *reusable_build_test_all
# coverage is not supported on Windows
Expand Down Expand Up @@ -390,7 +390,7 @@ tasks:
<<: *coverage_targets_example_multi_python
name: "examples/multi_python_versions: MacOS, workspace"
working_directory: examples/multi_python_versions
platform: macos
platform: macos_arm64
integration_test_multi_python_versions_windows_workspace:
<<: *reusable_build_test_all
<<: *common_workspace_flags
Expand Down Expand Up @@ -427,7 +427,7 @@ tasks:
<<: *reusable_build_test_all
name: "examples/pip_parse: MacOS"
working_directory: examples/pip_parse
platform: macos
platform: macos_arm64
integration_test_pip_parse_windows:
<<: *reusable_build_test_all
name: "examples/pip_parse: Windows"
Expand Down Expand Up @@ -458,7 +458,7 @@ tasks:
<<: *common_workspace_flags
name: "examples/pip_parse_vendored: MacOS"
working_directory: examples/pip_parse_vendored
platform: macos
platform: macos_arm64
# We don't run pip_parse_vendored under Windows as the file checked in is
# generated from a repository rule containing OS-specific rendered paths.

Expand All @@ -481,7 +481,7 @@ tasks:
<<: *common_workspace_flags
name: "examples/py_proto_library: MacOS, workspace"
working_directory: examples/py_proto_library
platform: macos
platform: macos_arm64
integration_test_py_proto_library_windows_workspace:
<<: *reusable_build_test_all
<<: *common_workspace_flags
Expand All @@ -506,7 +506,7 @@ tasks:
<<: *common_workspace_flags
name: "examples/pip_repository_annotations: macOS, workspace"
working_directory: examples/pip_repository_annotations
platform: macos
platform: macos_arm64
integration_test_pip_repository_annotations_windows_workspace:
<<: *reusable_build_test_all
<<: *common_workspace_flags
Expand All @@ -528,7 +528,7 @@ tasks:
integration_test_bazelinbazel_macos:
<<: *common_bazelinbazel_config
name: "tests/integration bazel-in-bazel: macOS (subset)"
platform: macos
platform: macos_arm64
build_targets: ["//tests/integration:local_toolchains_test_bazel_self"]
test_targets: ["//tests/integration:local_toolchains_test_bazel_self"]
# The bazelinbazel tests were disabled on Windows to save CI jobs slots, and
Expand Down Expand Up @@ -581,7 +581,7 @@ tasks:
<<: *reusable_build_test_all
name: "compile_pip_requirements: MacOS"
working_directory: tests/integration/compile_pip_requirements
platform: macos
platform: macos_arm64
shell_commands:
# Make a change to the locked requirements and then assert that //:requirements.update does the
# right thing.
Expand Down Expand Up @@ -620,7 +620,7 @@ tasks:
<<: *common_workspace_flags
name: "ignore_root_user_error: macOS, workspace"
working_directory: tests/integration/ignore_root_user_error
platform: macos
platform: macos_arm64
integration_test_ignore_root_user_error_windows_workspace:
<<: *reusable_build_test_all
<<: *common_workspace_flags
Expand Down Expand Up @@ -663,7 +663,7 @@ tasks:
integration_compile_pip_requirements_test_from_external_repo_macos:
name: "compile_pip_requirements_test_from_external_repo: macOS"
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
platform: macos
platform: macos_arm64
shell_commands:
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
- "bazel test @compile_pip_requirements//..."
Expand Down
5 changes: 3 additions & 2 deletions docs/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ are Linux, Mac, and Windows.

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