Skip to content

Commit

Permalink
Fix Bazel 4 support (protocolbuffers#10438)
Browse files Browse the repository at this point in the history
* Downgrade a presubmit to Bazel 4.0.0 to reproduce failure

* Add explicit dependency on more recent platforms package

* Upgrade to Bazel 4.2.2, the oldest supported version
  • Loading branch information
mkruskal-google authored Aug 22, 2022
1 parent 7b091c5 commit 2eea38e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ http_archive(
],
)

# Bazel platform rules.
http_archive(
name = "platforms",
sha256 = "a879ea428c6d56ab0ec18224f976515948822451473a80d06c2e50af0bbe5121",
strip_prefix = "platforms-da5541f26b7de1dc8e04c075c99df5351742a4a2",
urls = ["https://github.com/bazelbuild/platforms/archive/da5541f26b7de1dc8e04c075c99df5351742a4a2.zip"], # 2022-05-27
)

# Load common dependencies.
load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
protobuf_deps()
Expand Down
4 changes: 2 additions & 2 deletions kokoro/linux/benchmark/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Install Bazel 4.0.0.
use_bazel.sh 4.0.0
# Install Bazel 4.2.2.
use_bazel.sh 4.2.2

# Change to repo root
cd $(dirname $0)/../../..
Expand Down
2 changes: 1 addition & 1 deletion kokoro/linux/java_linkage_monitor/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# This script selects a specific Dockerfile (for building a Docker image) and
# a script to run inside that image.

use_bazel.sh 5.1.1
use_bazel.sh 4.2.2

# Change to repo root
cd $(dirname $0)/../../..
Expand Down

0 comments on commit 2eea38e

Please sign in to comment.