Skip to content

Commit 6c91f5c

Browse files
committed
chore: add Bazel 8 testing
1 parent 2b4a52c commit 6c91f5c

File tree

10 files changed

+25
-28
lines changed

10 files changed

+25
-28
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
7.0.2
1+
7.4.1
22
# The first line of this file is used by Bazelisk and Bazel to be sure
33
# the right version of Bazel is used to build and test this repo.
44
# This also defines which version is used on CI.

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: "e2e/smoke"
33
matrix:
44
platform: ["debian10", "macos", "ubuntu2004", "windows"]
5-
bazel: ["7.x"]
5+
bazel: ["7.x", "8.x"]
66
tasks:
77
run_tests:
88
name: "Run test module"

.github/workflows/ci.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ concurrency:
1818

1919
jobs:
2020
test:
21-
uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6
21+
uses: bazel-contrib/.github/.github/workflows/bazel.yaml@646899086d7aaee8e532540480f3e91e00596234 # Dec 11 2024
2222
with:
2323
folders: '[".", "e2e/smoke", "examples"]'
2424
exclude: |
2525
[
26-
{"bazelversion": "6.4.0"},
2726
{"folder": ".", "bzlmodEnabled": false},
28-
{"folder": "examples", "bzlmodEnabled": false},
29-
{"folder": ".", "os": "windows-latest"}
3027
]

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True
1616

1717
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
1818
protoc.toolchain(
19-
version = "v27.3",
19+
version = "v28.2",
2020
)
2121
use_repo(protoc, "toolchains_protoc_hub")
2222

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
# Pre-built protoc toolchain for Bazel 7
2-
3-
> [!CAUTION]
4-
> Bazel 8 and recent rules_proto changes broke this toolchain.
5-
> We don't currently have any plans to address this.
6-
> Instead, we expect someone on the protobuf team to follow through with the
7-
> "End Goal" promised in https://protobuf.dev/news/2024-10-01/
8-
> where this functionality is upstreamed.
9-
> Follow https://github.com/protocolbuffers/protobuf/issues/19558
1+
# Pre-built protoc toolchain for Bazel
102

113
_#NeverCompileProtocAgain_
124

e2e/smoke/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../.bazelversion

e2e/smoke/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bazel_dep(name = "toolchains_protoc", version = "0.0.0")
2-
bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
2+
bazel_dep(name = "rules_proto", version = "7.1.0")
33

44
local_path_override(
55
module_name = "toolchains_protoc",

examples/.bazelversion

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.bazelversion

examples/MODULE.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
bazel_dep(name = "toolchains_protoc", version = "0.0.0")
2-
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
3-
bazel_dep(name = "aspect_rules_py", version = "0.7.1")
4-
bazel_dep(name = "rules_java", version = "7.6.5")
5-
bazel_dep(name = "rules_proto", version = "6.0.0")
6-
bazel_dep(name = "rules_python", version = "0.32.2")
7-
bazel_dep(name = "rules_go", version = "0.48.0")
8-
bazel_dep(name = "rules_uv", version = "0.10.0")
2+
bazel_dep(name = "aspect_bazel_lib", version = "2.11.0")
3+
bazel_dep(name = "aspect_rules_py", version = "1.0.0")
4+
bazel_dep(name = "rules_java", version = "8.6.3")
5+
bazel_dep(name = "rules_proto", version = "7.1.0")
6+
bazel_dep(name = "rules_python", version = "1.0.0")
7+
bazel_dep(name = "rules_go", version = "0.52.0")
8+
bazel_dep(name = "rules_uv", version = "0.49.0")
99

1010
# This example is in the same repo with the ruleset, so we should point to the code at HEAD
1111
# rather than use any release on the Bazel Central Registry.

0 commit comments

Comments
 (0)