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

deps: Bump com_github_grpc_grpc -> 1.69.0 #37888

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion bazel/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ config_setting(

cc_proto_library(
name = "grpc_health_proto",
deps = ["@com_github_grpc_grpc//src/proto/grpc/health/v1:_health_proto_only"],
deps = ["@com_github_grpc_grpc//src/proto/grpc/health/v1:health_proto"],
)

config_setting(
Expand Down
66 changes: 51 additions & 15 deletions bazel/grpc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/BUILD b/BUILD
index 06b69411a8..05cd878ae8 100644
index 6a23c6c354..80ddecf0bf 100644
--- a/BUILD
+++ b/BUILD
@@ -29,7 +29,7 @@ licenses(["reciprocal"])
@@ -33,7 +33,7 @@ package(
default_visibility = ["//visibility:public"],
features = [
"-parse_headers",
Expand All @@ -12,10 +12,10 @@ index 06b69411a8..05cd878ae8 100644
)

diff --git a/src/core/BUILD b/src/core/BUILD
index 1bb970e049..81265483e9 100644
index f65a41fbe3..0a1e3dc631 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -24,7 +24,7 @@ licenses(["reciprocal"])
@@ -27,7 +27,7 @@ licenses(["reciprocal"])
package(
default_visibility = ["//:__subpackages__"],
features = [
Expand All @@ -24,16 +24,52 @@ index 1bb970e049..81265483e9 100644
],
)

diff --git a/bazel/generate_cc.bzl b/bazel/generate_cc.bzl
index a2c7f3a1bb..cd023ebb06 100644
--- a/bazel/generate_cc.bzl
+++ b/bazel/generate_cc.bzl
@@ -134,7 +134,7 @@ def generate_cc_impl(ctx):
diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h
index a4cd1bacc8..8a21719cc7 100644
--- a/src/core/lib/promise/detail/promise_factory.h
+++ b/src/core/lib/promise/detail/promise_factory.h
@@ -188,7 +188,7 @@ class OncePromiseFactory {
GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION explicit OncePromiseFactory(F f)
: f_(std::move(f)) {}

# Include the output directory so that protoc puts the generated code in the
# right directory.
- arguments.append("--proto_path={0}{1}".format(dir_out, proto_root))
+ arguments.append("--proto_path={0}".format(dir_out))
arguments += [_get_srcs_file_path(proto) for proto in protos]
- GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION Promise Make(Arg&& a) {
+ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Promise Make(Arg&& a) {
return PromiseFactoryImpl(std::move(f_), std::forward<Arg>(a));
}
};
diff --git a/third_party/BUILD b/third_party/BUILD
index 77cb52d0fc..596b348ccd 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -18,19 +18,19 @@ package(default_visibility = ["//:__subpackages__"])

alias(
name = "libssl",
- actual = "@boringssl//:ssl",
+ actual = "@envoy//bazel:boringssl",
tags = ["manual"],
)

alias(
name = "libcrypto",
- actual = "@boringssl//:crypto",
+ actual = "@envoy//bazel:boringcrypto",
tags = ["manual"],
)

alias(
name = "madler_zlib",
- actual = "@zlib//:zlib",
+ actual = "@envoy//bazel/foreign_cc:zlib",
tags = ["manual"],
)

@@ -61,7 +61,7 @@ alias(

alias(
name = "cares",
- actual = "@com_github_cares_cares//:ares",
+ actual = "@envoy//bazel/foreign_cc:ares",
tags = ["manual"],
)

# create a list of well known proto files if the argument is non-None
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "gRPC",
project_desc = "gRPC C core library",
project_url = "https://grpc.io",
version = "1.63.2",
sha256 = "5b5b9c6507ec166ec0e9e82f58280c36544540ecdd818eaab7b8601596b74c9e",
version = "1.69.0",
sha256 = "cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc",
strip_prefix = "grpc-{version}",
urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"],
use_category = ["dataplane_core", "controlplane"],
release_date = "2024-08-02",
release_date = "2024-12-24",
cpe = "cpe:2.3:a:grpc:grpc:*",
license = "Apache-2.0",
license_url = "https://github.com/grpc/grpc/blob/v{version}/LICENSE",
Expand Down