Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 12 additions & 5 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,14 @@ buildifier:


matrix:
# Keep in sync with .bcr/presubmit.yml
platform:
- ubuntu2204
- debian11
- macos_arm64
- windows
bazel: [7.*, 8.*, 9.*]
# Keep in sync with .bcr/presubmit.yml
bazel: [7.x, 8.x, 9.x]

tasks:
# Keep in sync with .bcr/presubmit.yml
Expand Down Expand Up @@ -187,13 +189,15 @@ tasks:
bazel: 7.x
ubuntu:
<<: *reusable_config
name: "Default: Ubuntu"
name: "Default: Ubuntu, Bazel {bazel}"
platform: ubuntu2204
bazel: ${{ bazel }}
ubuntu_upcoming:
<<: *reusable_config
name: "Default: Ubuntu, upcoming Bazel"
platform: ubuntu2204
bazel: last_rc
# This is an advisory job; doesn't block merges
# RCs may have regressions, so don't fail our CI on them
soft_fail:
- exit_status: 1
Expand Down Expand Up @@ -250,16 +254,19 @@ tasks:

debian:
<<: *reusable_config
name: "Default: Debian"
name: "Default: Debian, Bazel {bazel}"
platform: debian11
bazel: ${{ bazel }}
macos_arm64:
<<: *reusable_config
name: "Default: MacOS"
name: "Default: MacOS, Bazel {bazel}"
platform: macos_arm64
bazel: ${{ bazel }}
windows:
<<: *reusable_config
name: "Default: Windows"
name: "Default: Windows, Bazel {bazel}"
platform: windows
bazel: ${{ bazel }}
test_flags:
- "--test_tag_filters=-integration-test,-fix-windows"
rbe_min:
Expand Down
5 changes: 5 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ common --incompatible_disallow_struct_provider_syntax
# Makes Bazel 7 act more like Bazel 8
common --incompatible_use_plus_in_repo_names

# Needed to make Windows with a py_binary in data deps work. The Bazel launcher
# is used, which falls back to finding python.exe on PATH to bootstrap.
# See https://github.com/bazel-contrib/rules_python/issues/3655
common --incompatible_strict_action_env=false

# Windows makes use of runfiles for some rules
build --enable_runfiles

Expand Down
2 changes: 1 addition & 1 deletion .bcr/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bcr_test_module:
module_path: "examples/bzlmod"
matrix:
platform: ["debian11", "macos", "ubuntu2204", "windows"]
bazel: [7.*, 8.*, 9.*]
bazel: [7.x, 8.x, 9.x]
tasks:
run_tests:
name: "Run test module"
Expand Down