Update deps and test new Bazel versions (#29)

rules_proto 6 breaks with last_green.
buildbuddy-io · Nov 15, 2024 · 23102f0 · 23102f0
1 parent ebd817b
commit 23102f0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.3.2
+7.4.1
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: "examples"
   matrix:
     platform: ["debian10", "macos", "ubuntu2004"]
-    bazel: ["7.x"]
+    bazel: ["7.x", "8.0.0rc2"]
   tasks:
     run_tests:
       name: "Run test module"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        bazel: [7.x, last_green]
+        bazel: [7.x, 8.0.0rc2, last_green]
         os: [ubuntu-latest, macos-13, macos-latest]
     env:
       BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -7,17 +7,17 @@ module(
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 
 bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True)
-bazel_dep(name = "rules_java", version = "7.5.0", dev_dependency = True)
-bazel_dep(name = "rules_proto", version = "6.0.0", dev_dependency = True)
-bazel_dep(name = "toolchains_protoc", version = "0.2.4", dev_dependency = True)
+bazel_dep(name = "rules_java", version = "8.3.2", dev_dependency = True)
+bazel_dep(name = "rules_proto", version = "7.0.2", dev_dependency = True)
+bazel_dep(name = "toolchains_protoc", version = "0.3.4", dev_dependency = True)
 
 http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
 
 http_jar(
     name = "protobuf_java",
     dev_dependency = True,
-    integrity = "sha256-6Q2N25Y7IKlypqWbUJOt4rB8vlRsqzJ5qvQ4MmA4X1g=",
-    urls = ["https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.25.3/protobuf-java-3.25.3.jar"],
+    integrity = "sha256-0C+GOpCj/8d9Xu7AMcGOV58wx8uY8/OoFP6LiMQ9O8g=",
+    urls = ["https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/4.27.3/protobuf-java-4.27.3.jar"],
 )
 
 register_toolchains(

diff --git a/examples/.bazelversion b/examples/.bazelversion
@@ -1 +1 @@
-7.3.2
+7.4.1
diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
@@ -18,6 +18,11 @@ bazel_dep(name = "rules_nodejs", version = "6.1.1")
 bazel_dep(name = "rules_python", version = "0.32.2")
 bazel_dep(name = "rules_rust", version = "0.49.3")
 bazel_dep(name = "platforms", version = "0.0.10")
+# Required for compatibillity with Bazel@HEAD.
+single_version_override(
+    module_name = "rules_proto",
+    version = "7.0.2",
+)
 
 # Don't update the versions below, they are only used to verify the hermeticity of bazel_env.