Skip to content

Commit

Permalink
Update deps and test new Bazel versions
Browse files Browse the repository at this point in the history
rules_proto 6 breaks with last_green.
  • Loading branch information
fmeum committed Nov 15, 2024
1 parent ebd817b commit 3595dc9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
common --incompatible_strict_action_env
common --incompatible_enable_proto_toolchain_resolution
common --check_direct_dependencies=error
common --test_output=errors

common --java_runtime_version=remotejdk_21
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.2
7.4.1
2 changes: 1 addition & 1 deletion .bcr/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ module(
bazel_compatibility = [">=7.0.2"],
)

bazel_dep(name = "bazel_skylib", version = "1.6.1")
bazel_dep(name = "bazel_skylib", version = "1.7.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(
Expand Down
2 changes: 1 addition & 1 deletion examples/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.3.2
7.4.1

0 comments on commit 3595dc9

Please sign in to comment.