From 366333be64102a31b7017c2e9e4d2a6071dba038 Mon Sep 17 00:00:00 2001 From: maleo Date: Thu, 11 Jul 2024 09:37:54 +0000 Subject: [PATCH 1/2] Add gRPC 1.65.0 --- modules/grpc/1.65.0/MODULE.bazel | 82 ++++ .../1.65.0/patches/add_module_bazel.patch | 88 +++++ .../grpc/1.65.0/patches/adopt_bzlmod.patch | 364 ++++++++++++++++++ modules/grpc/1.65.0/presubmit.yml | 33 ++ modules/grpc/1.65.0/source.json | 10 + modules/grpc/metadata.json | 3 +- 6 files changed, 579 insertions(+), 1 deletion(-) create mode 100644 modules/grpc/1.65.0/MODULE.bazel create mode 100644 modules/grpc/1.65.0/patches/add_module_bazel.patch create mode 100644 modules/grpc/1.65.0/patches/adopt_bzlmod.patch create mode 100644 modules/grpc/1.65.0/presubmit.yml create mode 100644 modules/grpc/1.65.0/source.json diff --git a/modules/grpc/1.65.0/MODULE.bazel b/modules/grpc/1.65.0/MODULE.bazel new file mode 100644 index 00000000000..c2c79011357 --- /dev/null +++ b/modules/grpc/1.65.0/MODULE.bazel @@ -0,0 +1,82 @@ +module( + name = "grpc", + version = "1.65.0", + compatibility_level = 1, + repo_name = "com_github_grpc_grpc", +) + +bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "com_google_absl") +bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") +bazel_dep(name = "c-ares", version = "1.15.0", repo_name = "com_github_cares_cares") +bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle") +bazel_dep(name = "google_benchmark", version = "1.8.4", repo_name = "com_github_google_benchmark") +bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis") +bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest") +bazel_dep(name = "opentelemetry-cpp", version = "1.14.2", repo_name = "io_opentelemetry_cpp") +bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep(name = "prometheus-cpp", version = "1.2.4", repo_name = "com_github_jupp0r_prometheus_cpp") +bazel_dep(name = "protobuf", version = "26.0.bcr.2", repo_name = "com_google_protobuf") +bazel_dep(name = "re2", version = "2023-09-01", repo_name = "com_googlesource_code_re2") +bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple") +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "rules_go", version = "0.48.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_java", version = "7.4.0") +bazel_dep(name = "rules_proto", version = "6.0.0") +bazel_dep(name = "zlib", version = "1.3.1.bcr.1") + +grpc_repo_deps_ext = use_extension("//bazel:grpc_deps.bzl", "grpc_repo_deps_ext") +use_repo( + grpc_repo_deps_ext, + "com_envoyproxy_protoc_gen_validate", + "com_github_cncf_udpa", + "com_github_cncf_xds", + "envoy_api", + "google_cloud_cpp", + "io_opencensus_cpp", +) + +switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") +switched_rules.use_languages( + cc = True, + grpc = True, + python = True, +) +use_repo(switched_rules, "com_google_googleapis_imports") + +bazel_dep(name = "rules_python", version = "0.31.0") + +PYTHON_VERSIONS = [ + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", +] + +python = use_extension("@rules_python//python/extensions:python.bzl", "python") + +[ + python.toolchain( + is_default = python_version == PYTHON_VERSIONS[-1], + python_version = python_version, + ) + for python_version in PYTHON_VERSIONS +] + +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") + +[ + pip.parse( + hub_name = "grpc_python_dependencies", + python_version = python_version, + requirements_lock = "//:requirements.bazel.txt", + ) + for python_version in PYTHON_VERSIONS +] + +use_repo(pip, "grpc_python_dependencies") + +grpc_python_deps_ext = use_extension("//bazel:grpc_python_deps.bzl", "grpc_python_deps_ext") +use_repo(grpc_python_deps_ext, "cython") diff --git a/modules/grpc/1.65.0/patches/add_module_bazel.patch b/modules/grpc/1.65.0/patches/add_module_bazel.patch new file mode 100644 index 00000000000..aa45e3d42b3 --- /dev/null +++ b/modules/grpc/1.65.0/patches/add_module_bazel.patch @@ -0,0 +1,88 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +new file mode 100644 +index 0000000000..c2c7901135 +--- /dev/null ++++ b/MODULE.bazel +@@ -0,0 +1,82 @@ ++module( ++ name = "grpc", ++ version = "1.65.0", ++ compatibility_level = 1, ++ repo_name = "com_github_grpc_grpc", ++) ++ ++bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "com_google_absl") ++bazel_dep(name = "apple_support", version = "1.15.1", repo_name = "build_bazel_apple_support") ++bazel_dep(name = "bazel_skylib", version = "1.5.0") ++bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014") ++bazel_dep(name = "c-ares", version = "1.15.0", repo_name = "com_github_cares_cares") ++bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle") ++bazel_dep(name = "google_benchmark", version = "1.8.4", repo_name = "com_github_google_benchmark") ++bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", repo_name = "com_google_googleapis") ++bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest") ++bazel_dep(name = "opentelemetry-cpp", version = "1.14.2", repo_name = "io_opentelemetry_cpp") ++bazel_dep(name = "platforms", version = "0.0.10") ++bazel_dep(name = "prometheus-cpp", version = "1.2.4", repo_name = "com_github_jupp0r_prometheus_cpp") ++bazel_dep(name = "protobuf", version = "26.0.bcr.2", repo_name = "com_google_protobuf") ++bazel_dep(name = "re2", version = "2023-09-01", repo_name = "com_googlesource_code_re2") ++bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple") ++bazel_dep(name = "rules_cc", version = "0.0.9") ++bazel_dep(name = "rules_go", version = "0.48.0", repo_name = "io_bazel_rules_go") ++bazel_dep(name = "rules_java", version = "7.4.0") ++bazel_dep(name = "rules_proto", version = "6.0.0") ++bazel_dep(name = "zlib", version = "1.3.1.bcr.1") ++ ++grpc_repo_deps_ext = use_extension("//bazel:grpc_deps.bzl", "grpc_repo_deps_ext") ++use_repo( ++ grpc_repo_deps_ext, ++ "com_envoyproxy_protoc_gen_validate", ++ "com_github_cncf_udpa", ++ "com_github_cncf_xds", ++ "envoy_api", ++ "google_cloud_cpp", ++ "io_opencensus_cpp", ++) ++ ++switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules") ++switched_rules.use_languages( ++ cc = True, ++ grpc = True, ++ python = True, ++) ++use_repo(switched_rules, "com_google_googleapis_imports") ++ ++bazel_dep(name = "rules_python", version = "0.31.0") ++ ++PYTHON_VERSIONS = [ ++ "3.8", ++ "3.9", ++ "3.10", ++ "3.11", ++ "3.12", ++] ++ ++python = use_extension("@rules_python//python/extensions:python.bzl", "python") ++ ++[ ++ python.toolchain( ++ is_default = python_version == PYTHON_VERSIONS[-1], ++ python_version = python_version, ++ ) ++ for python_version in PYTHON_VERSIONS ++] ++ ++pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") ++ ++[ ++ pip.parse( ++ hub_name = "grpc_python_dependencies", ++ python_version = python_version, ++ requirements_lock = "//:requirements.bazel.txt", ++ ) ++ for python_version in PYTHON_VERSIONS ++] ++ ++use_repo(pip, "grpc_python_dependencies") ++ ++grpc_python_deps_ext = use_extension("//bazel:grpc_python_deps.bzl", "grpc_python_deps_ext") ++use_repo(grpc_python_deps_ext, "cython") diff --git a/modules/grpc/1.65.0/patches/adopt_bzlmod.patch b/modules/grpc/1.65.0/patches/adopt_bzlmod.patch new file mode 100644 index 00000000000..362c86f4920 --- /dev/null +++ b/modules/grpc/1.65.0/patches/adopt_bzlmod.patch @@ -0,0 +1,364 @@ +diff --git a/bazel/cython_library.bzl b/bazel/cython_library.bzl +index dc2ef7a890..fd2881ed8c 100644 +--- a/bazel/cython_library.bzl ++++ b/bazel/cython_library.bzl +@@ -72,7 +72,7 @@ def pyx_library(name, deps = [], py_deps = [], srcs = [], **kwargs): + native.cc_binary( + name = shared_object_name, + srcs = [stem + ".cpp"], +- deps = deps + ["@local_config_python//:python_headers"], ++ deps = deps + ["@rules_python//python/cc:current_py_cc_headers"], + defines = defines, + linkshared = 1, + ) +diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl +index b9d5fe47c9..257beb26e0 100644 +--- a/bazel/grpc_deps.bzl ++++ b/bazel/grpc_deps.bzl +@@ -19,172 +19,6 @@ load("//bazel:grpc_python_deps.bzl", "grpc_python_deps") + # buildifier: disable=unnamed-macro + def grpc_deps(): + """Loads dependencies need to compile and test the grpc library.""" +- +- if "platforms" not in native.existing_rules(): +- http_archive( +- name = "platforms", +- sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz", +- "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz", +- ], +- ) +- +- if "boringssl" not in native.existing_rules(): +- http_archive( +- name = "boringssl", +- # Use github mirror instead of https://boringssl.googlesource.com/boringssl +- # to obtain a boringssl archive with consistent sha256 +- sha256 = "9f441d72fccb9a3faf96470478c8ccfaaeb8db1cffd4d78b698f782124dad1b0", +- strip_prefix = "boringssl-b8a2bffc598f230484ff48a247526a9820facfc2", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b8a2bffc598f230484ff48a247526a9820facfc2.tar.gz", +- "https://github.com/google/boringssl/archive/b8a2bffc598f230484ff48a247526a9820facfc2.tar.gz", +- ], +- ) +- +- if "zlib" not in native.existing_rules(): +- http_archive( +- name = "zlib", +- build_file = "@com_github_grpc_grpc//third_party:zlib.BUILD", +- sha256 = "18337cdb32562003c39d9f7322b9a166ad4abfb2b909566428e11f96d2385586", +- strip_prefix = "zlib-09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851.tar.gz", +- "https://github.com/madler/zlib/archive/09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851.tar.gz", +- ], +- ) +- +- if "com_google_protobuf" not in native.existing_rules(): +- http_archive( +- name = "com_google_protobuf", +- sha256 = "387478260190c540388839a3449c635a69708d92fc38ea6e2364b1196db90ea5", +- strip_prefix = "protobuf-2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5", +- urls = [ +- # https://github.com/protocolbuffers/protobuf/commits/v26.1 +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz", +- "https://github.com/protocolbuffers/protobuf/archive/2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5.tar.gz", +- ], +- patches = [ +- "@com_github_grpc_grpc//third_party:protobuf.patch", +- "@com_github_grpc_grpc//third_party:protobuf.10007.patch", +- ], +- patch_args = ["-p1"], +- ) +- +- if "com_google_googletest" not in native.existing_rules(): +- http_archive( +- name = "com_google_googletest", +- sha256 = "31bf78bd91b96dd5e24fab3bb1d7f3f7453ccbaceec9afb86d6e4816a15ab109", +- strip_prefix = "googletest-2dd1c131950043a8ad5ab0d2dda0e0970596586a", +- urls = [ +- # 2023-10-09 +- "https://github.com/google/googletest/archive/2dd1c131950043a8ad5ab0d2dda0e0970596586a.tar.gz", +- ], +- ) +- +- if "com_google_fuzztest" not in native.existing_rules(): +- # when updating this remember to run: +- # bazel run @com_google_fuzztest//bazel:setup_configs > tools/fuzztest.bazelrc +- http_archive( +- name = "com_google_fuzztest", +- sha256 = "cdf8d8cd3cdc77280a7c59b310edf234e489a96b6e727cb271e7dfbeb9bcca8d", +- strip_prefix = "fuzztest-4ecaeb5084a061a862af8f86789ee184cd3d3f18", +- urls = [ +- # 2023-05-16 +- "https://github.com/google/fuzztest/archive/4ecaeb5084a061a862af8f86789ee184cd3d3f18.tar.gz", +- ], +- ) +- +- if "rules_cc" not in native.existing_rules(): +- http_archive( +- name = "rules_cc", +- sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf", +- strip_prefix = "rules_cc-0.0.9", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz", +- "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz", +- ], +- ) +- +- if "com_github_google_benchmark" not in native.existing_rules(): +- http_archive( +- name = "com_github_google_benchmark", +- sha256 = "8e7b955f04bc6984e4f14074d0d191474f76a6c8e849e04a9dced49bc975f2d4", +- strip_prefix = "benchmark-344117638c8ff7e239044fd0fa7085839fc03021", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/344117638c8ff7e239044fd0fa7085839fc03021.tar.gz", +- "https://github.com/google/benchmark/archive/344117638c8ff7e239044fd0fa7085839fc03021.tar.gz", +- ], +- ) +- +- if "com_googlesource_code_re2" not in native.existing_rules(): +- http_archive( +- name = "com_googlesource_code_re2", +- sha256 = "1ae8ccfdb1066a731bba6ee0881baad5efd2cd661acd9569b689f2586e1a50e9", +- strip_prefix = "re2-2022-04-01", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/2022-04-01.tar.gz", +- "https://github.com/google/re2/archive/2022-04-01.tar.gz", +- ], +- ) +- +- if "com_github_cares_cares" not in native.existing_rules(): +- http_archive( +- name = "com_github_cares_cares", +- build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD", +- sha256 = "bf26e5b25e259911914a85ae847b6d723488adb5af4f8bdeb9d0871a318476e3", +- strip_prefix = "c-ares-6360e96b5cf8e5980c887ce58ef727e53d77243a", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz", +- "https://github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz", +- ], +- ) +- +- if "com_google_absl" not in native.existing_rules(): +- http_archive( +- name = "com_google_absl", +- sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440", +- strip_prefix = "abseil-cpp-20240116.0", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", +- "https://github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz", +- ], +- ) +- +- if "bazel_toolchains" not in native.existing_rules(): +- # list of releases is at https://github.com/bazelbuild/bazel-toolchains/releases +- http_archive( +- name = "bazel_toolchains", +- sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", +- strip_prefix = "bazel-toolchains-4.1.0", +- urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz", +- "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz", +- ], +- ) +- +- if "bazel_skylib" not in native.existing_rules(): +- http_archive( +- name = "bazel_skylib", +- urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", +- "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", +- ], +- sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", +- ) +- +- if "bazel_compdb" not in native.existing_rules(): +- http_archive( +- name = "bazel_compdb", +- sha256 = "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4", +- strip_prefix = "bazel-compilation-database-0.4.5", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz", +- "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz", +- ], +- ) +- + if "io_opencensus_cpp" not in native.existing_rules(): + http_archive( + name = "io_opencensus_cpp", +@@ -207,58 +41,6 @@ def grpc_deps(): + ], + ) + +- if "io_bazel_rules_go" not in native.existing_rules(): +- http_archive( +- name = "io_bazel_rules_go", +- sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b", +- urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", +- "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", +- ], +- ) +- +- if "build_bazel_rules_apple" not in native.existing_rules(): +- http_archive( +- name = "build_bazel_rules_apple", +- sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz", +- "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz", +- ], +- ) +- +- if "build_bazel_apple_support" not in native.existing_rules(): +- http_archive( +- name = "build_bazel_apple_support", +- sha256 = "cf4d63f39c7ba9059f70e995bf5fe1019267d3f77379c2028561a5d7645ef67c", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/1.11.1/apple_support.1.11.1.tar.gz", +- "https://github.com/bazelbuild/apple_support/releases/download/1.11.1/apple_support.1.11.1.tar.gz", +- ], +- ) +- +- if "com_google_googleapis" not in native.existing_rules(): +- http_archive( +- name = "com_google_googleapis", +- sha256 = "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", +- strip_prefix = "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92", +- build_file = Label("//bazel:googleapis.BUILD"), +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", +- "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", +- ], +- ) +- +- if "bazel_gazelle" not in native.existing_rules(): +- http_archive( +- name = "bazel_gazelle", +- sha256 = "d76bf7a60fd8b050444090dfa2837a4eaf9829e1165618ee35dceca5cbdf58d5", +- urls = [ +- "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz", +- "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz", +- ], +- ) +- + if "opencensus_proto" not in native.existing_rules(): + http_archive( + name = "opencensus_proto", +@@ -293,34 +75,6 @@ def grpc_deps(): + ], + ) + +- # TODO(stanleycheung): remove this when prometheus-cpp AND +- # opentelemetry-cpp cut a new release +- # This override is needed because this fix +- # https://github.com/jupp0r/prometheus-cpp/pull/626 +- # has not been included in the latest prometheus-cpp release yet. +- # We also need opentelemetry-cpp to update their dependency on +- # prometheus-cpp after that fix is released. +- # Without the fix, we cannot build the prometheus exporter with bazel 6 +- if "com_github_jupp0r_prometheus_cpp" not in native.existing_rules(): +- http_archive( +- name = "com_github_jupp0r_prometheus_cpp", +- strip_prefix = "prometheus-cpp-b1234816facfdda29845c46696a02998a4af115a", +- urls = [ +- "https://github.com/jupp0r/prometheus-cpp/archive/b123481.zip", +- ], +- ) +- +- if "io_opentelemetry_cpp" not in native.existing_rules(): +- http_archive( +- name = "io_opentelemetry_cpp", +- sha256 = "ed681d20a684b7d485a49288e7cfb2d182bf882e5c112c5f2fa3f9e9da2278fc", +- strip_prefix = "opentelemetry-cpp-4bd64c9a336fd438d6c4c9dad2e6b61b0585311f", +- urls = [ +- "https://storage.googleapis.com/grpc-bazel-mirror/github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz", +- "https://github.com/open-telemetry/opentelemetry-cpp/archive/4bd64c9a336fd438d6c4c9dad2e6b61b0585311f.tar.gz", +- ], +- ) +- + if "google_cloud_cpp" not in native.existing_rules(): + http_archive( + name = "google_cloud_cpp", +@@ -331,8 +85,15 @@ def grpc_deps(): + "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.16.0.tar.gz", + ], + ) +- +- grpc_python_deps() ++ http_archive( ++ name = "com_github_cncf_udpa", ++ sha256 = "0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899", ++ strip_prefix = "xds-e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7", ++ urls = [ ++ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz", ++ "https://github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz", ++ ], ++ ) + + # TODO: move some dependencies from "grpc_deps" here? + # buildifier: disable=unnamed-macro +@@ -413,3 +174,5 @@ def grpc_test_only_deps(): + strip_prefix = "libprotobuf-mutator-1f95f8083066f5b38fd2db172e7e7f9aa7c49d2d", + build_file = "@com_github_grpc_grpc//third_party:libprotobuf_mutator.BUILD", + ) ++ ++grpc_repo_deps_ext = module_extension(implementation = lambda ctx: grpc_deps()) +diff --git a/bazel/grpc_python_deps.bzl b/bazel/grpc_python_deps.bzl +index dbfff526a1..8948fc573d 100644 +--- a/bazel/grpc_python_deps.bzl ++++ b/bazel/grpc_python_deps.bzl +@@ -16,6 +16,18 @@ + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + load("@com_github_grpc_grpc//third_party/py:python_configure.bzl", "python_configure") + ++# buildifier: disable=unnamed-macro ++def cython(): ++ http_archive( ++ name = "cython", ++ build_file = "@com_github_grpc_grpc//third_party:cython.BUILD", ++ sha256 = "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607", ++ strip_prefix = "cython-0.29.35", ++ urls = [ ++ "https://github.com/cython/cython/archive/0.29.35.tar.gz", ++ ], ++ ) ++ + # buildifier: disable=unnamed-macro + def grpc_python_deps(): + """Loads dependencies for gRPC Python.""" +@@ -35,12 +47,6 @@ def grpc_python_deps(): + ) + + if "cython" not in native.existing_rules(): +- http_archive( +- name = "cython", +- build_file = "@com_github_grpc_grpc//third_party:cython.BUILD", +- sha256 = "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607", +- strip_prefix = "cython-0.29.35", +- urls = [ +- "https://github.com/cython/cython/archive/0.29.35.tar.gz", +- ], +- ) ++ cython() ++ ++grpc_python_deps_ext = module_extension(implementation = lambda ctx: cython()) +diff --git a/bazel/python_rules.bzl b/bazel/python_rules.bzl +index e195d2790b..5924fd5b5e 100644 +--- a/bazel/python_rules.bzl ++++ b/bazel/python_rules.bzl +@@ -190,11 +190,7 @@ def _generate_pb2_grpc_src_impl(context): + arguments = [] + tools = [context.executable._protoc, context.executable._grpc_plugin] + out_dir = get_out_dir(protos, context) +- if out_dir.import_path: +- # is virtual imports +- out_path = out_dir.path +- else: +- out_path = context.genfiles_dir.path ++ out_path = out_dir.path + arguments += get_plugin_args( + context.executable._grpc_plugin, + plugin_flags, diff --git a/modules/grpc/1.65.0/presubmit.yml b/modules/grpc/1.65.0/presubmit.yml new file mode 100644 index 00000000000..b7b9f33e8d3 --- /dev/null +++ b/modules/grpc/1.65.0/presubmit.yml @@ -0,0 +1,33 @@ +matrix: + platform: ["debian10", "ubuntu2004"] + bazel: + - 7.x + +tasks: + verify_targets: + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@grpc//:grpc' + - '@grpc//:grpc_unsecure' + - '@grpc//:grpc++' + - '@grpc//:grpc++_unsecure' + - '@grpc//examples/protos/...' + + verify_windows: + platform: windows + bazel: ${{ bazel }} + build_targets: + - '@grpc//:grpc' + - '@grpc//:grpc_unsecure' + - '@grpc//:grpc++' + - '@grpc//:grpc++_unsecure' + + verify_macos: + platform: macos + bazel: ${{ bazel }} + build_targets: + - '@grpc//:grpc' + - '@grpc//:grpc_unsecure' + - '@grpc//:grpc++' + - '@grpc//:grpc++_unsecure' diff --git a/modules/grpc/1.65.0/source.json b/modules/grpc/1.65.0/source.json new file mode 100644 index 00000000000..4540b113924 --- /dev/null +++ b/modules/grpc/1.65.0/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-68Os/ecM+uP08EuNu3IllUDLHcQnvjYlafvCYH2r/jk=", + "strip_prefix": "grpc-1.65.0", + "url": "https://github.com/grpc/grpc/archive/refs/tags/v1.65.0.tar.gz", + "patch_strip": 1, + "patches": { + "add_module_bazel.patch": "sha256-MASGzFiPj53S1c6CgHyYuLD0XXklG95eABIZLhdZGk8=", + "adopt_bzlmod.patch": "sha256-xj3GrXJKe+M3L/Jukz8a4eRTcnSuKIIwh8BnyTomNRw=" + } +} diff --git a/modules/grpc/metadata.json b/modules/grpc/metadata.json index f5f12fb41c3..b106ed6c9cf 100644 --- a/modules/grpc/metadata.json +++ b/modules/grpc/metadata.json @@ -22,7 +22,8 @@ "1.62.1.bcr.1", "1.62.1.bcr.2", "1.63.1", - "1.63.1.bcr.1" + "1.63.1.bcr.1", + "1.65.0" ], "yanked_versions": {} } From ce53d709cec0ce693f1109de5cf05b25bf0fd0b8 Mon Sep 17 00:00:00 2001 From: maleo Date: Thu, 11 Jul 2024 12:39:49 +0000 Subject: [PATCH 2/2] Disable layering check for macOS --- .../1.65.0/patches/disable-layering-check.patch | 13 +++++++++++++ modules/grpc/1.65.0/source.json | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 modules/grpc/1.65.0/patches/disable-layering-check.patch diff --git a/modules/grpc/1.65.0/patches/disable-layering-check.patch b/modules/grpc/1.65.0/patches/disable-layering-check.patch new file mode 100644 index 00000000000..e6de461ce33 --- /dev/null +++ b/modules/grpc/1.65.0/patches/disable-layering-check.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/BUILD b/src/core/BUILD +index 757aaad95b..de60930421 100644 +--- a/src/core/BUILD ++++ b/src/core/BUILD +@@ -25,7 +25,7 @@ licenses(["reciprocal"]) + package( + default_visibility = ["//:__subpackages__"], + features = [ +- "layering_check", ++ "-layering_check", + ], + ) + diff --git a/modules/grpc/1.65.0/source.json b/modules/grpc/1.65.0/source.json index 4540b113924..6530a124103 100644 --- a/modules/grpc/1.65.0/source.json +++ b/modules/grpc/1.65.0/source.json @@ -5,6 +5,7 @@ "patch_strip": 1, "patches": { "add_module_bazel.patch": "sha256-MASGzFiPj53S1c6CgHyYuLD0XXklG95eABIZLhdZGk8=", - "adopt_bzlmod.patch": "sha256-xj3GrXJKe+M3L/Jukz8a4eRTcnSuKIIwh8BnyTomNRw=" + "adopt_bzlmod.patch": "sha256-xj3GrXJKe+M3L/Jukz8a4eRTcnSuKIIwh8BnyTomNRw=", + "disable-layering-check.patch": "sha256-v3IG7eZiEgWJ7hoaE1zRvXdSEjxbfPFIEIZrTEwt4IU=" } }