Skip to content

deps: update abseil and grpc dependencies #16687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanavlasov merged 9 commits into from
Jun 15, 2021
Merged

deps: update abseil and grpc dependencies #16687

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb17670
deps: update grpc dependency to 1.38.0
antoniovicente May 27, 2021
a5c2fe7
apply patch from https://github.com/grpc/grpc/pull/26359
antoniovicente May 27, 2021
2f957b9
undo patch
antoniovicente Jun 8, 2021
111af82
update grpc to a3ae8e00a2c5553c806e83fae83e33f0198913f0
antoniovicente Jun 8, 2021
401e2ac
Merge remote-tracking branch 'upstream/main' into grpc-1.38
antoniovicente Jun 8, 2021
945439b
also update abseil
antoniovicente Jun 8, 2021
9a64dfb
fix date
antoniovicente Jun 9, 2021
6e90f02
Merge remote-tracking branch 'upstream/main' into grpc-1.38
antoniovicente Jun 14, 2021
5330f2d
Merge remote-tracking branch 'upstream/main' into grpc-1.38
antoniovicente Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,21 @@ def _com_github_grpc_grpc():
actual = "@upb//:descriptor_upb_proto",
)

native.bind(
name = "upb_lib_descriptor_reflection",
actual = "@upb//:descriptor_upb_proto_reflection",
)

native.bind(
name = "upb_textformat_lib",
actual = "@upb//:textformat",
)

native.bind(
name = "upb_json_lib",
actual = "@upb//:json",
)

def _upb():
external_http_archive(name = "upb")

Expand Down
14 changes: 7 additions & 7 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Abseil",
project_desc = "Open source collection of C++ libraries drawn from the most fundamental pieces of Google’s internal codebase",
project_url = "https://abseil.io/",
version = "5d8fc9192245f0ea67094af57399d7931d6bd53f",
sha256 = "e3812f256dd7347a33bf9d93a950cf356c61c0596842ff07d8154cd415145d83",
version = "17c954d90d5661e27db8fc5f086085690a8372d9",
sha256 = "2e4ace2ed32a4ccfd29e856ad72b4fd1eae2ec060d3ba8646857fa170d6e8269",
strip_prefix = "abseil-cpp-{version}",
urls = ["https://github.com/abseil/abseil-cpp/archive/{version}.tar.gz"],
use_category = ["dataplane_core", "controlplane"],
release_date = "2020-11-24",
release_date = "2021-06-07",

@moderation moderation Jun 8, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UTC for this commit is 2021-06-03 and this is why CI has failed. As per prior conversation it would be preferable if we could use the latest release of abseil at https://github.com/abseil/abseil-cpp/releases/tag/20210324.2. There is a parallel PR to bump abseil at #16681

@antoniovicente antoniovicente Jun 9, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@htuch @moderation

I see comments about #16681 having trouble compiling under Windows. Given all these difficulties, I would strongly prefer to go with a patch to grpc and decouple the abseil version bump from the grpc version bump.

Can I please go back to the version with the patch?

cpe = "N/A",
),
com_github_c_ares_c_ares = dict(
Expand Down Expand Up @@ -239,12 +239,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "gRPC",
project_desc = "gRPC C core library",
project_url = "https://grpc.io",
version = "1.34.0",
sha256 = "7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39",
version = "a3ae8e00a2c5553c806e83fae83e33f0198913f0",
sha256 = "1ccc2056b68b81ada8df61310e03dfa0541c34821fd711654d0590a7321db9c8",
strip_prefix = "grpc-{version}",
urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"],
urls = ["https://github.com/grpc/grpc/archive/{version}.tar.gz"],
use_category = ["dataplane_core", "controlplane"],
release_date = "2020-12-02",
release_date = "2021-06-07",
cpe = "cpe:2.3:a:grpc:grpc:*",
),
com_github_luajit_luajit = dict(
Expand Down