Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@malkia
malkia committed Nov 26, 2024
1 parent abc7df4 commit f5bd5c9
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 91 deletions.
21 changes: 9 additions & 12 deletions MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ single_version_override(
module_name = "abseil-cpp",
patch_strip = 1,
patches = [
"bazel/absl_win10_cache_zone.diff",
"bazel/absl_win10_cache_zone.patch",
],
)
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
Expand All @@ -19,26 +19,21 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.1")
bazel_dep(name = "depend_on_what_you_use", version = "0.5.0")
bazel_dep(name = "google_benchmark", version = "1.8.5")
bazel_dep(name = "googletest", version = "1.15.2")
bazel_dep(name = "grpc", version = "1.66.0.bcr.3")

bazel_dep(name = "grpc", version = "1.68.0")
single_version_override(
module_name = "grpc",
patch_strip = 1,
patches = [
# https://github.com/grpc/grpc/pull/37534
# https://github.com/grpc/grpc/pull/37534.diff
"bazel/grpc_bzlmod.diff",
# https://github.com/grpc/grpc/pull/38101/files
# https://github.com/grpc/grpc/pull/38101/commits/f093af21a9bc2a27156e7cd30744844797287253/patch
# https://github.com/grpc/grpc/commit/f093af21a9bc2a27156e7cd30744844797287253.diff
"bazel/grpc_ares_fix_2.diff",
"bazel/grpc_ares_fix.patch",
],
)

bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_cc", version = "0.0.13") # Issues with 0.0.14 and grpc/protobuf
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_proto", version = "6.0.2") # Issues with 7.0.0 and grpc/protobuf
bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
bazel_dep(name = "rules_multitool", version = "1.0.0")
Expand All @@ -61,7 +56,9 @@ archive_override(
integrity = "sha256-U80yztsndi6iBgqcjYPkuCLeE9c7XV03ots89VAY1pQ=",
patch_strip = 1,
# Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
patches = ["bazel/opentelemetry-proto.patch"],
patches = [
"bazel/opentelemetry-proto.patch",
],
strip_prefix = "opentelemetry-proto-1.4.0",
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
)
Expand Down
0 bazel/absl_win10_cache_zone.diff → bazel/absl_win10_cache_zone.patch
View file
File renamed without changes.
22 changes: 11 additions & 11 deletions bazel/grpc_ares_fix_2.diff → bazel/grpc_ares_fix.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
index 37a8f85cc5..b319f17aaf 100644
index 3bfd15537e..0d4dcd5579 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
Expand All @@ -12,15 +12,15 @@ index 37a8f85cc5..b319f17aaf 100644
*from_len = recv_from_source_addr_len_;
}
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
index ef70bfc5b6..e8b05452c7 100644
index 6f988c8710..f30826bbb4 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -73,7 +73,7 @@ namespace {
// instantiated at the top of the virtual socket function callstack.
class WSAErrorContext final {
public:
- explicit WSAErrorContext(){};
+ explicit WSAErrorContext() {};

~WSAErrorContext() {
if (error_ != 0) {
@@ -307,7 +307,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
// c-ares overloads this recv_from virtual socket function to receive
// data on both UDP and TCP sockets, and from is nullptr for TCP.
if (from != nullptr) {
- CHECK(*from_len <= recv_from_source_addr_len_);
+ CHECK(*from_len >= recv_from_source_addr_len_);
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
*from_len = recv_from_source_addr_len_;
}
1 change: 0 additions & 1 deletion bazel/grpc_ares_fix_2.txt
View file

This file was deleted.

21 changes: 0 additions & 21 deletions bazel/grpc_bzlmod.diff
View file

This file was deleted.

2 changes: 1 addition & 1 deletion bazel/opentelemetry-proto.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,5 @@ index 0000000..a5a5e54
+ compatibility_level = 0,
+)
+
+bazel_dep(name = "grpc", version = "1.66.0.bcr.3")
+bazel_dep(name = "grpc", version = "1.68.0")
+bazel_dep(name = "rules_proto", version = "6.0.2")
21 changes: 9 additions & 12 deletions x/MODULE.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ single_version_override(
module_name = "abseil-cpp",
patch_strip = 1,
patches = [
"bazel/absl_win10_cache_zone.diff",
"bazel/absl_win10_cache_zone.patch",
],
)
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4")
Expand All @@ -23,26 +23,21 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.1")
bazel_dep(name = "depend_on_what_you_use", version = "0.5.0")
bazel_dep(name = "google_benchmark", version = "1.8.5")
bazel_dep(name = "googletest", version = "1.15.2")
bazel_dep(name = "grpc", version = "1.66.0.bcr.3")

bazel_dep(name = "grpc", version = "1.68.0")
single_version_override(
module_name = "grpc",
patch_strip = 1,
patches = [
# https://github.com/grpc/grpc/pull/37534
# https://github.com/grpc/grpc/pull/37534.diff
"bazel/grpc_bzlmod.diff",
# https://github.com/grpc/grpc/pull/38101/files
# https://github.com/grpc/grpc/pull/38101/commits/f093af21a9bc2a27156e7cd30744844797287253/patch
# https://github.com/grpc/grpc/commit/f093af21a9bc2a27156e7cd30744844797287253.diff
"bazel/grpc_ares_fix_2.diff",
"bazel/grpc_ares_fix.patch",
],
)

bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "rules_cc", version = "0.0.13") # Issues with 0.0.14 and grpc/protobuf
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_proto", version = "6.0.2") # Issues with 7.0.0 and grpc/protobuf
bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
bazel_dep(name = "rules_multitool", version = "1.0.0")
Expand All @@ -65,7 +60,9 @@ archive_override(
integrity = "sha256-U80yztsndi6iBgqcjYPkuCLeE9c7XV03ots89VAY1pQ=",
patch_strip = 1,
# Copied from https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/opentelemetry-proto/1.3.1/patches
patches = ["bazel/opentelemetry-proto.patch"],
patches = [
"bazel/opentelemetry-proto.patch",
],
strip_prefix = "opentelemetry-proto-1.4.0",
urls = "https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.4.0.tar.gz",
)
Expand Down
0 x/bazel/absl_win10_cache_zone.diff → x/bazel/absl_win10_cache_zone.patch
View file
File renamed without changes.
22 changes: 11 additions & 11 deletions x/bazel/grpc_ares_fix_2.diff → x/bazel/grpc_ares_fix.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
index 37a8f85cc5..b319f17aaf 100644
index 3bfd15537e..0d4dcd5579 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
@@ -224,7 +224,7 @@ class GrpcPolledFdWindows : public GrpcPolledFd {
Expand All @@ -12,15 +12,15 @@ index 37a8f85cc5..b319f17aaf 100644
*from_len = recv_from_source_addr_len_;
}
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
index ef70bfc5b6..e8b05452c7 100644
index 6f988c8710..f30826bbb4 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -73,7 +73,7 @@ namespace {
// instantiated at the top of the virtual socket function callstack.
class WSAErrorContext final {
public:
- explicit WSAErrorContext(){};
+ explicit WSAErrorContext() {};

~WSAErrorContext() {
if (error_ != 0) {
@@ -307,7 +307,7 @@ class GrpcPolledFdWindows final : public GrpcPolledFd {
// c-ares overloads this recv_from virtual socket function to receive
// data on both UDP and TCP sockets, and from is nullptr for TCP.
if (from != nullptr) {
- CHECK(*from_len <= recv_from_source_addr_len_);
+ CHECK(*from_len >= recv_from_source_addr_len_);
memcpy(from, &recv_from_source_addr_, recv_from_source_addr_len_);
*from_len = recv_from_source_addr_len_;
}
21 changes: 0 additions & 21 deletions x/bazel/grpc_bzlmod.diff
View file

This file was deleted.

2 changes: 1 addition & 1 deletion x/bazel/opentelemetry-proto.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,5 @@ index 0000000..a5a5e54
+ compatibility_level = 0,
+)
+
+bazel_dep(name = "grpc", version = "1.66.0.bcr.3")
+bazel_dep(name = "grpc", version = "1.68.0")
+bazel_dep(name = "rules_proto", version = "6.0.2")

0 comments on commit f5bd5c9

Please sign in to comment.