Skip to content

Automated fix for refs/heads/bind-alias #2

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

Open
github-actions wants to merge 2 commits into
base: bind-alias
Choose a base branch
from
Open

Automated fix for refs/heads/bind-alias #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a245a6
Replace bind() targets with alias() ones
mering Dec 11, 2023
7917660
Automated change: Fix sanity tests
mering Jan 15, 2024
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
76 changes: 0 additions & 76 deletions CMakeLists.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ load("@com_github_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps"

benchmark_deps()

# This is a transitive dependency from com_github_google_benchmark
bind(
name = "cares",
actual = "@com_github_cares_cares//:ares",
)

load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")

opentelemetry_cpp_deps()
Expand All @@ -117,6 +123,12 @@ load("@io_opentelemetry_cpp//bazel:extra_deps.bzl", "opentelemetry_extra_deps")

opentelemetry_extra_deps()

# Transitive dependency of opentelemetry_extra_deps()
bind(
name = "madler_zlib",
actual = "@zlib//:zlib",
)

# TODO: Enable below once https://github.com/bazel-xcode/PodToBUILD/issues/232 is resolved
#
#http_archive(
Expand Down
2 changes: 1 addition & 1 deletion bazel/generate_cc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ _generate_cc = rule(
mandatory = False,
),
"_protoc": attr.label(
default = Label("//external:protocol_compiler"),
default = Label("//third_party:protocol_compiler"),
executable = True,
cfg = "exec",
),
Expand Down
2 changes: 1 addition & 1 deletion bazel/generate_objc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ generate_objc = rule(
default = "@com_google_protobuf//:well_known_type_protos",
),
"_protoc": attr.label(
default = Label("//external:protocol_compiler"),
default = Label("//third_party:protocol_compiler"),
executable = True,
cfg = "exec",
),
Expand Down
4 changes: 2 additions & 2 deletions bazel/grpc_build_system.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def _get_external_deps(external_deps):
elif dep == "cares":
ret += select({
"//:grpc_no_ares": [],
"//conditions:default": ["//external:cares"],
"//conditions:default": ["//third_party:cares"],
})
elif dep == "cronet_c_for_grpc":
ret.append("//third_party/objective_c/Cronet:cronet_c_for_grpc")
Expand All @@ -78,7 +78,7 @@ def _get_external_deps(external_deps):
elif dep.startswith("google_cloud_cpp"):
ret.append(dep.replace("google_cloud_cpp", "@google_cloud_cpp//"))
else:
ret.append("//external:" + dep)
ret.append("//third_party:" + dep)
return ret

def _update_visibility(visibility):
Expand Down
221 changes: 1 addition & 220 deletions bazel/grpc_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,222 +14,12 @@
"""Load dependencies needed to compile and test the grpc library as a 3rd-party consumer."""

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@com_github_grpc_grpc//bazel:grpc_python_deps.bzl", "grpc_python_deps")
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."""

native.bind(
name = "upb_lib",
actual = "@com_google_protobuf//upb",
)

native.bind(
name = "upb_amalgamation_lib",
actual = "@com_google_protobuf//upb:amalgamation",
)

native.bind(
name = "upb_base_lib",
actual = "@com_google_protobuf//upb/base",
)

native.bind(
name = "upb_collections_lib",
actual = "@com_google_protobuf//upb/collections",
)

native.bind(
name = "upb_mem_lib",
actual = "@com_google_protobuf//upb/mem",
)

native.bind(
name = "upb_reflection",
actual = "@com_google_protobuf//upb:reflection",
)

native.bind(
name = "upb_lib_descriptor",
actual = "@com_google_protobuf//upb:descriptor_upb_proto",
)

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

native.bind(
name = "upb_textformat_lib",
actual = "@com_google_protobuf//upb/text",
)

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

native.bind(
name = "upb_generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
actual = "@com_google_protobuf//upb:generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me",
)

native.bind(
name = "libssl",
actual = "@boringssl//:ssl",
)

native.bind(
name = "libcrypto",
actual = "@boringssl//:crypto",
)

native.bind(
name = "madler_zlib",
actual = "@zlib//:zlib",
)

native.bind(
name = "protobuf",
actual = "@com_google_protobuf//:protobuf",
)

native.bind(
name = "protobuf_clib",
actual = "@com_google_protobuf//:protoc_lib",
)

native.bind(
name = "protobuf_headers",
actual = "@com_google_protobuf//:protobuf_headers",
)

native.bind(
name = "protocol_compiler",
actual = "@com_google_protobuf//:protoc",
)

native.bind(
name = "cares",
actual = "@com_github_cares_cares//:ares",
)

native.bind(
name = "gtest",
actual = "@com_google_googletest//:gtest",
)

native.bind(
name = "fuzztest",
actual = "@com_google_fuzztest//fuzztest",
)

native.bind(
name = "fuzztest_main",
actual = "@com_google_fuzztest//fuzztest:fuzztest_gtest_main",
)

native.bind(
name = "benchmark",
actual = "@com_github_google_benchmark//:benchmark",
)

native.bind(
name = "re2",
actual = "@com_googlesource_code_re2//:re2",
)

native.bind(
name = "grpc_cpp_plugin",
actual = "@com_github_grpc_grpc//src/compiler:grpc_cpp_plugin",
)

native.bind(
name = "grpc++_codegen_proto",
actual = "@com_github_grpc_grpc//:grpc++_codegen_proto",
)

native.bind(
name = "opencensus-context",
actual = "@io_opencensus_cpp//opencensus/context:context",
)

native.bind(
name = "opencensus-trace",
actual = "@io_opencensus_cpp//opencensus/trace:trace",
)

native.bind(
name = "opencensus-trace-context_util",
actual = "@io_opencensus_cpp//opencensus/trace:context_util",
)

native.bind(
name = "opencensus-trace-propagation",
actual = "@io_opencensus_cpp//opencensus/trace:grpc_trace_bin",
)

native.bind(
name = "opencensus-trace-span_context",
actual = "@io_opencensus_cpp//opencensus/trace:span_context",
)

native.bind(
name = "opencensus-stats",
actual = "@io_opencensus_cpp//opencensus/stats:stats",
)

native.bind(
name = "opencensus-stats-test",
actual = "@io_opencensus_cpp//opencensus/stats:test_utils",
)

native.bind(
name = "opencensus-with-tag-map",
actual = "@io_opencensus_cpp//opencensus/tags:with_tag_map",
)

native.bind(
name = "opencensus-tags",
actual = "@io_opencensus_cpp//opencensus/tags:tags",
)

native.bind(
name = "opencensus-tags-context_util",
actual = "@io_opencensus_cpp//opencensus/tags:context_util",
)

native.bind(
name = "opencensus-trace-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/trace/stackdriver:stackdriver_exporter",
)

native.bind(
name = "opencensus-stats-stackdriver_exporter",
actual = "@io_opencensus_cpp//opencensus/exporters/stats/stackdriver:stackdriver_exporter",
)

native.bind(
name = "googleapis_trace_grpc_service",
actual = "@com_google_googleapis//google/devtools/cloudtrace/v2:cloudtrace_cc_grpc",
)

native.bind(
name = "googleapis_monitoring_grpc_service",
actual = "@com_google_googleapis//google/monitoring/v3:monitoring_cc_grpc",
)

native.bind(
name = "googleapis_logging_grpc_service",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_grpc",
)

native.bind(
name = "googleapis_logging_cc_proto",
actual = "@com_google_googleapis//google/logging/v2:logging_cc_proto",
)

if "platforms" not in native.existing_rules():
http_archive(
name = "platforms",
Expand Down Expand Up @@ -550,15 +340,6 @@ def grpc_test_only_deps():

Loads dependencies that are only needed to run grpc library's tests.
"""
native.bind(
name = "twisted",
actual = "@com_github_twisted_twisted//:twisted",
)

native.bind(
name = "yaml",
actual = "@com_github_yaml_pyyaml//:yaml",
)

if "com_github_twisted_twisted" not in native.existing_rules():
http_archive(
Expand Down
Loading