Skip to content
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.

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

[Core] upgrade grpc and boringssl #20919

Merged
merged 1 commit into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 13 additions & 8 deletions bazel/ray_deps_setup.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -227,23 +227,28 @@ def ray_deps_setup():
auto_http_archive(
name = "com_github_grpc_grpc",
# NOTE: If you update this, also update @boringssl's hash.
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.38.1.tar.gz",
sha256 = "f60e5b112913bf776a22c16a3053cc02cf55e60bf27a959fd54d7aaf8e2da6e8",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.42.0.tar.gz",
sha256 = "b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c",
patches = [
"//thirdparty/patches:grpc-cython-copts.patch",
# Delete after upgrading from 1.42.0
"//thirdparty/patches:grpc-default-initialization.patch",
"//thirdparty/patches:grpc-python.patch",
"//thirdparty/patches:grpc-windows-python-header-path.patch",
],
)

auto_http_archive(
http_archive(
# This rule is used by @com_github_grpc_grpc, and using a GitHub mirror
# provides a deterministic archive hash for caching. Explanation here:
# https://github.com/grpc/grpc/blob/4790ab6d97e634a1ede983be393f3bb3c132b2f7/bazel/grpc_deps.bzl#L102
# https://github.com/grpc/grpc/blob/1ff1feaa83e071d87c07827b0a317ffac673794f/bazel/grpc_deps.bzl#L189
# Ensure this rule matches the rule used by grpc's bazel/grpc_deps.bzl
name = "boringssl",
# Ensure this matches the commit used by grpc's bazel/grpc_deps.bzl
url = "https://github.com/google/boringssl/archive/688fc5cf5428868679d2ae1072cad81055752068.tar.gz",
sha256 = "f8616dff15cb8aad6705af53c7caf7a5f1103b6aaf59c76b55995e179d47f89c",
sha256 = "e168777eb0fc14ea5a65749a2f53c095935a6ea65f38899a289808fb0c221dc4",
strip_prefix = "boringssl-4fb158925f7753d80fb858cb0239dff893ef9f15",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/4fb158925f7753d80fb858cb0239dff893ef9f15.tar.gz",
"https://github.com/google/boringssl/archive/4fb158925f7753d80fb858cb0239dff893ef9f15.tar.gz",
],
)

auto_http_archive(
Expand Down
11 changes: 11 additions & 0 deletions thirdparty/patches/grpc-default-initialization.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git src/core/ext/xds/xds_api.h src/core/ext/xds/xds_api.h
--- src/core/ext/xds/xds_api.h
+++ src/core/ext/xds/xds_api.h
@@ -55,6 +55,7 @@ class XdsApi {
static const char* kEdsTypeUrl;

struct Duration {
+ Duration() {}
int64_t seconds = 0;
int32_t nanos = 0;
bool operator==(const Duration& other) const {
13 changes: 0 additions & 13 deletions thirdparty/patches/grpc-windows-python-header-path.patch

This file was deleted.