From fec9c545c305e6168c3e29e058c725d1a5f3384b Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 14 Jan 2021 09:19:22 +0100 Subject: [PATCH] include a bugfix in third_party/protobuf --- bazel/grpc_deps.bzl | 8 ++++---- third_party/protobuf | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 2130687cb08..1519ba43f5d 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -169,11 +169,11 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): http_archive( name = "com_google_protobuf", - sha256 = "ac3773b90abe689dab5bf1d4a7611e9c3898cb438ddb610117c9014f4ff736b2", - strip_prefix = "protobuf-4a09d77a85a46c65d8b070e20dc88db904eb83af", + sha256 = "88f7b3d062759e9428394cd2b854722c7142de6d9ea1cc0514a251dcec91bc0b", + strip_prefix = "protobuf-19fb89416f3fdc2d6668f3738f444885575285bc", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/4a09d77a85a46c65d8b070e20dc88db904eb83af.tar.gz", - "https://github.com/google/protobuf/archive/4a09d77a85a46c65d8b070e20dc88db904eb83af.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/19fb89416f3fdc2d6668f3738f444885575285bc.tar.gz", + "https://github.com/google/protobuf/archive/19fb89416f3fdc2d6668f3738f444885575285bc.tar.gz", ], ) diff --git a/third_party/protobuf b/third_party/protobuf index 4a09d77a85a..19fb89416f3 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 4a09d77a85a46c65d8b070e20dc88db904eb83af +Subproject commit 19fb89416f3fdc2d6668f3738f444885575285bc diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 06c0d81ffa3..363e6f1a5f7 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -35,7 +35,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb) c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/googletest (6e2f397) 15ae750151ac9341e5945eb38f8982d59fb99201 third_party/libuv (v1.34.0) - 4a09d77a85a46c65d8b070e20dc88db904eb83af third_party/protobuf (v3.7.0-rc.2-1277-gfde7cf735) + 19fb89416f3fdc2d6668f3738f444885575285bc third_party/protobuf (v3.7.0-rc.2-1277-gfde7cf735) e020f3aef8ae6cb59f384bfbaaed72e71e88ccd6 third_party/protoc-gen-validate (v0.4.1) aecba11114cf1fac5497aeb844b6966106de3eb6 third_party/re2 (heads/master) 1f710aca26a95876e64973a6d2a927a9f4b20ca4 third_party/udpa (heads/master)