From 9ddd71335b5f0562da82b4560d21aa6a3a803e8d Mon Sep 17 00:00:00 2001 From: Yannic Bonenberger Date: Wed, 16 Sep 2020 12:55:43 +0200 Subject: [PATCH] Upgrade protobuf to 3.13.0, part 2/3 This change does the actual upgrade of Protobuf. I'll send a follow-up to remove the now-unused path-file for `3.11.3` when this has landed (and there is no risk of a rollback). Working towards making Bazel compatible with #11694 --- WORKSPACE | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 65d6663b50ae1f..bb7528f299ab41 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -98,12 +98,12 @@ http_archive( patch_args = ["-p1"], patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE, patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN, - patches = ["//third_party/protobuf:3.11.3.patch"], - sha256 = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", - strip_prefix = "protobuf-3.11.3", + patches = ["//third_party/protobuf:3.13.0.patch"], + sha256 = "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", + strip_prefix = "protobuf-3.13.0", urls = [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", ], ) @@ -172,7 +172,7 @@ distdir_tar( # bazelbuild/rules_proto "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", # protocolbuffers/protobuf - "v3.11.3.tar.gz", + "v3.13.0.tar.gz", # grpc/grpc "v1.26.0.tar.gz", # c-ares/c-ares @@ -209,7 +209,7 @@ distdir_tar( # bazelbuild/rules_proto "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", # protocolbuffers/protobuf - "v3.11.3.tar.gz": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", + "v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", # grpc/grpc "v1.26.0.tar.gz": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", # c-ares/c-ares @@ -285,9 +285,9 @@ distdir_tar( "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", ], # protocolbuffers/protobuf - "v3.11.3.tar.gz": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", + "v3.13.0.tar.gz": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", ], # grpc/grpc "v1.26.0.tar.gz": [ @@ -547,7 +547,7 @@ distdir_tar( # bazelbuild/rules_proto "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", # protocolbuffers/protobuf - "v3.11.3.tar.gz", + "v3.13.0.tar.gz", # grpc/grpc "v1.26.0.tar.gz", # c-ares/c-ares @@ -577,7 +577,7 @@ distdir_tar( # bazelbuild/rules_proto "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208", # protocolbuffers/protobuf - "v3.11.3.tar.gz": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852", + "v3.13.0.tar.gz": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a", # grpc/grpc "v1.26.0.tar.gz": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81", # c-ares/c-ares @@ -623,9 +623,9 @@ distdir_tar( "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz", ], # protocolbuffers/protobuf - "v3.11.3.tar.gz": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz", + "v3.13.0.tar.gz": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz", ], # grpc/grpc "v1.26.0.tar.gz": [