From 3595dc9764c131c6e4c9afbf66de3d8b692e6b56 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Fri, 15 Nov 2024 17:55:47 +0100 Subject: [PATCH] Update deps and test new Bazel versions rules_proto 6 breaks with last_green. --- .bazelrc | 1 + .bazelversion | 2 +- .bcr/presubmit.yml | 2 +- .github/workflows/ci.yml | 2 +- MODULE.bazel | 12 ++++++------ examples/.bazelversion | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.bazelrc b/.bazelrc index 15a7513..b86fd1b 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/.bazelversion b/.bazelversion index eab246c..815da58 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.3.2 +7.4.1 diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index f296f45..b53f1a5 100644 --- 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 index e1677ee..6c8994f 100644 --- 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 index 9a732df..245d416 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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( diff --git a/examples/.bazelversion b/examples/.bazelversion index eab246c..815da58 100644 --- a/examples/.bazelversion +++ b/examples/.bazelversion @@ -1 +1 @@ -7.3.2 +7.4.1