Skip to content

Commit 2aec9e1

Browse files
Google APIscopybara-github
authored andcommitted
build: Update protobuf to 25.2 in WORKSPACE
build: Update grpc to 1.60.0 in WORKSPACE build: Remove pin for boringssl in WORKSPACE build: Update bazel to 6.3.0 in .bazeliskrc PiperOrigin-RevId: 603226138
1 parent e3802a1 commit 2aec9e1

2 files changed

Lines changed: 10 additions & 20 deletions

File tree

.bazeliskrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# See https://github.com/bazelbuild/bazelisk
2-
USE_BAZEL_VERSION=6.0.0
2+
USE_BAZEL_VERSION=6.3.0

WORKSPACE

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,9 @@ http_archive(
125125
# for most of the other languages as well, so they can be considered as the core cross-language
126126
# dependencies.
127127

128-
# Import boringssl explicitly to override what gRPC imports as its dependency.
129-
# Boringssl build fails on gcc12 without this fix:
130-
# https://github.com/google/boringssl/commit/8462a367bb57e9524c3d8eca9c62733c63a63cf4,
131-
# which is present only in the newest version of boringssl, not the one imported
132-
# by gRPC. Remove this import once gRPC depends on a newer version.
133-
http_archive(
134-
name = "boringssl",
135-
sha256 = "b460f8673f3393e58ce506e9cdde7f2c3b2575b075f214cb819fb57d809f052b",
136-
strip_prefix = "boringssl-bb41bc007079982da419c0ec3186e510cbcf09d0",
137-
urls = [
138-
"https://github.com/google/boringssl/archive/bb41bc007079982da419c0ec3186e510cbcf09d0.zip",
139-
],
140-
)
128+
_grpc_version = "1.60.0"
141129

142-
_grpc_version = "1.55.1"
143-
144-
_grpc_sha256 = "17c0685da231917a7b3be2671a7b13b550a85fdda5e475313264c5f51c4da3f8"
130+
_grpc_sha256 = "09640607a340ff0d97407ed22fe4adb177e5bb85329821122084359cd57c3dea"
145131

146132
http_archive(
147133
name = "com_github_grpc_grpc",
@@ -152,11 +138,15 @@ http_archive(
152138

153139
# Explicitly declaring Protobuf version, while Protobuf dependency is already
154140
# instantiated in grpc_deps().
141+
_protobuf_version = "25.2"
142+
143+
_protobuf_sha256 = "8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871"
144+
155145
http_archive(
156146
name = "com_google_protobuf",
157-
sha256 = "0b0395d34e000f1229679e10d984ed7913078f3dd7f26cf0476467f5e65716f4",
158-
strip_prefix = "protobuf-23.2",
159-
urls = ["https://github.com/protocolbuffers/protobuf/archive/v23.2.tar.gz"],
147+
sha256 = _protobuf_sha256,
148+
strip_prefix = "protobuf-%s" % _protobuf_version,
149+
urls = ["https://github.com/protocolbuffers/protobuf/archive/v%s.tar.gz" % _protobuf_version],
160150
)
161151

162152
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")

0 commit comments

Comments
 (0)