Skip to content

Add support for Bazel 9.x #134

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
pkwarren merged 2 commits into from
Apr 27, 2026
Merged

Add support for Bazel 9.x #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
849b31d
Add support for Bazel 9.x
pkwarren Apr 27, 2026
6ef4e4e
Bump go version and go module deps to match
pkwarren Apr 27, 2026
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
4 changes: 2 additions & 2 deletions .bcr/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
bcr_test_module:
module_path: "examples/bzlmod"
matrix:
platform: ["debian10", "macos", "ubuntu2004"]
bazel: [7.x, 8.x]
platform: ["debian12", "macos", "ubuntu2204"]
bazel: [7.x, 8.x, 9.x]
tasks:
run_tests:
name: "Run test module"
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ jobs:
# NOTE: Cache path doesn't support env expansion
linux:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
bazel: ["7.x", "8.x", "9.x"]
env:
USE_BAZEL_VERSION: ${{ matrix.bazel }}
steps:
# Caches and restores the bazelisk download directory, the bazel build directory.
- name: Cache bazel
Expand All @@ -19,12 +25,18 @@ jobs:
path: |
~/.cache/bazelisk
~/.cache/bazel
key: ${{ runner.os }}-bazel-cache
key: ${{ runner.os }}-bazel-${{ matrix.bazel }}-cache
- uses: actions/checkout@v2
- name: bazel test
run: make test
macos:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
bazel: ["7.x", "8.x", "9.x"]
env:
USE_BAZEL_VERSION: ${{ matrix.bazel }}
steps:
# Caches and restores the bazelisk download directory, the bazel build directory.
- name: Cache bazel
Expand All @@ -33,13 +45,13 @@ jobs:
path: |
~/.cache/bazelisk
/private/var/tmp/_bazel_runner
key: ${{ runner.os }}-bazel-cache
key: ${{ runner.os }}-bazel-${{ matrix.bazel }}-cache
- uses: actions/checkout@v2
- name: bazel test
run: make test
# Disabled due to error in protobuf on Windoes
# Disabled due to error in protobuf on Windows
# windows:
# runs-on: windows-latest
# runs-on: windows-latest
# steps:
# # Caches and restores the bazelisk download directory, the bazel build directory.
# - name: Cache bazel
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ module(
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "rules_go", version = "0.42.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
bazel_dep(name = "bazel_skylib", version = "1.7.1")

bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")

# We depend on gazelle at runtime to generate our proto_library rules
bazel_dep(name = "gazelle", version = "0.34.0", repo_name = "bazel_gazelle")
bazel_dep(name = "gazelle", version = "0.40.0", repo_name = "bazel_gazelle")

go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
Expand Down
1,668 changes: 871 additions & 797 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,519 changes: 1,880 additions & 639 deletions examples/bzlmod/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,067 changes: 2,006 additions & 61 deletions examples/echo/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,567 changes: 1,896 additions & 671 deletions examples/toolchain/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,572 changes: 1,897 additions & 675 deletions examples/unused/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

1,690 changes: 1,591 additions & 99 deletions examples/version/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

1,576 changes: 1,571 additions & 5 deletions examples/workspace/MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gazelle/buf/testdata/breaking_module/bar/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "bar_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/breaking_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/breaking_package/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/breaking_package_to_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/cross_resolve/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/cross_resolve/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/cross_resolve_override/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/cross_resolve_override/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/excludes_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/excludes_package/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/lint/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/merge/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/mix/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/mix/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/mix/v1/zap/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "zap_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/mix/v2/tap/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "tap_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/breaking_module/bar/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "bar_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/breaking_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/breaking_package/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/breaking_package_to_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/cross_resolve/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/cross_resolve/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/excludes_module/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/excludes_package/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/lint/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/merge/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_breaking_test", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/workspace/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/v2/workspace/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/workspace/fooapis/foo/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "foo_v1_proto",
Expand Down
2 changes: 1 addition & 1 deletion gazelle/buf/testdata/workspace/petapis/pets/v1/BUILD.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_buf//buf:defs.bzl", "buf_lint_test")
load("@rules_proto//proto:defs.bzl", "proto_library")

proto_library(
name = "pets_v1_proto",
Expand Down
14 changes: 6 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module github.com/bufbuild/rules_buf

go 1.21

toolchain go1.21.1
go 1.25.0
Comment thread
pkwarren marked this conversation as resolved.

require (
github.com/bazelbuild/bazel-gazelle v0.34.0
github.com/bazelbuild/buildtools v0.0.0-20231115204819-d4c9dccdfbb1
github.com/bazelbuild/rules_go v0.42.0
github.com/bazelbuild/bazel-gazelle v0.40.0
github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44
github.com/bazelbuild/rules_go v0.59.0
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -16,8 +14,8 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/mod v0.23.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/tools/go/vcs v0.1.0-deprecated // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)
Loading
Loading