Skip to content

Commit 47c87d2

Browse files
authored
Apply suggestions from code review
1 parent 730a566 commit 47c87d2

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.bazelci/presubmit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ buildifier:
5454
build_flags:
5555
- "--noenable_bzlmod"
5656
- "--enable_workspace"
57-
bazel: 7.4.1
57+
bazel: 7.x
5858
.common_bazelinbazel_config: &common_bazelinbazel_config
5959
build_flags:
6060
- "--build_tag_filters=integration-test"
@@ -205,6 +205,7 @@ tasks:
205205
name: "RBE: Ubuntu"
206206
platform: rbe_ubuntu2004
207207
# TODO @aignas 2024-12-11: get the RBE working in CI for bazel 8.0
208+
# See https://github.com/bazelbuild/rules_python/issues/2499
208209
bazel: 7.x
209210
test_flags:
210211
- "--test_tag_filters=-integration-test,-acceptance-test"

.pre-commit-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ repos:
4646
- id: update-deleted-packages
4747
name: Update deleted packages
4848
language: system
49+
# 7.x is necessary until https://github.com/bazel-contrib/rules_bazel_integration_test/pull/414
50+
# is merged and released
4951
entry: env USE_BAZEL_VERSION=7.x bazel run @rules_bazel_integration_test//tools:update_deleted_packages
5052
files: ^((examples|tests)/.*/(MODULE.bazel|WORKSPACE|WORKSPACE.bzlmod|BUILD.bazel)|.bazelrc)$
5153
pass_filenames: false

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ Unreleased changes template.
5252

5353
{#v0-0-0-changed}
5454
### Changed
55-
* The earliest version that is tested in our CI for `WORKSPACE` support now
56-
is `7.4.1`, which is in line with our bazel version support matrix - only the
57-
two latest bazel versions are supported at a time.
55+
* Bazel 6 support is dropped and Bazel 7.4.1 is the minimum supported
56+
version, per our Bazel support matrix. Earlier versions are not
57+
tested by CI, so functionality cannot be guaranteed.
5858

5959
{#v0-0-0-fixed}
6060
### Fixed

0 commit comments

Comments
 (0)