12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Protobuf to v3.13.0 (#1746) 

This makes cartographer compatible with
`--incompatible_blacklisted_protos_requires_proto_info`.
See https://github.com/bazelbuild/bazel/issues/11694

Signed-off-by: Yannic Bonenberger <contact@yannic-bonenberger.com>
master
Yannic 2020-09-14 11:42:59 +02:00 committed by GitHub
parent 2137b8477e
commit f2035b0877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bazel/repositories.bzl
View File

@ -206,19 +206,21 @@ def cartographer_repositories():
_maybe( _maybe(
http_archive, http_archive,
name = "bazel_skylib", name = "bazel_skylib",
strip_prefix = "bazel-skylib-67215655bf6ce349b2b88ae4f5945a706f8ce959", sha256 = "e5d90f0ec952883d56747b7604e2a15ee36e288bb556c3d0ed33e818a4d971f2",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/67215655bf6ce349b2b88ae4f5945a706f8ce959.tar.gz"], strip_prefix = "bazel-skylib-1.0.2",
urls = ["https://github.com/bazelbuild/bazel-skylib/archive/1.0.2.tar.gz"],
) )
_maybe( _maybe(
http_archive, http_archive,
name = "com_google_protobuf", name = "com_google_protobuf",
sha256 = "f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f", sha256 = "1c744a6a1f2c901e68c5521bc275e22bdc66256eeb605c2781923365b7087e5f",
strip_prefix = "protobuf-3.7.1", strip_prefix = "protobuf-3.13.0",
urls = [ urls = [
"https://mirror.bazel.build/github.com/google/protobuf/archive/v3.7.1.tar.gz", "https://mirror.bazel.build/github.com/google/protobuf/archive/v3.13.0.zip",
"https://github.com/google/protobuf/archive/v3.7.1.tar.gz", "https://github.com/google/protobuf/archive/v3.13.0.zip",
], ],
repo_mapping = {"@zlib": "@net_zlib_zlib"},
) )
_maybe( _maybe(
@ -272,6 +274,17 @@ def cartographer_repositories():
urls = ["https://github.com/abseil/abseil-cpp/archive/5441bbe1db5d0f2ca24b5b60166367b0966790af.tar.gz"], urls = ["https://github.com/abseil/abseil-cpp/archive/5441bbe1db5d0f2ca24b5b60166367b0966790af.tar.gz"],
) )
_maybe(
http_archive,
name = "rules_python",
sha256 = "e5470e92a18aa51830db99a4d9c492cc613761d5bdb7131c04bd92b9834380f6",
strip_prefix = "rules_python-4b84ad270387a7c439ebdccfd530e2339601ef27",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_python/archive/4b84ad270387a7c439ebdccfd530e2339601ef27.tar.gz",
"https://github.com/bazelbuild/rules_python/archive/4b84ad270387a7c439ebdccfd530e2339601ef27.tar.gz",
],
)
# TODO(rodrigoq): remove these binds once grpc#14140 has been merged, as well # TODO(rodrigoq): remove these binds once grpc#14140 has been merged, as well
# as removing `use_external` in cartographer_grpc/BUILD.bazel. # as removing `use_external` in cartographer_grpc/BUILD.bazel.
# https://github.com/grpc/grpc/pull/14140 # https://github.com/grpc/grpc/pull/14140