diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2021-09-10 15:16:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 15:16:10 +0200 |
| commit | 16a22f04244d5c64020c93102c3e0ea9984ef0e1 (patch) | |
| tree | ba858e7943a37fbe39df8aff7cb4273082898b14 | |
| parent | 624767281f58f08942bfdd693f361a00fd95185b (diff) | |
| parent | 5fd9d1f6385347a91bbe1b3ce47a79de72474393 (diff) | |
| download | rabbitmq-server-git-16a22f04244d5c64020c93102c3e0ea9984ef0e1.tar.gz | |
Merge pull request #3401 from rabbitmq/ranch-21-bazel
Use Ranch 2.1.0 in bazel build
| -rw-r--r-- | BUILD.ranch | 2 | ||||
| -rw-r--r-- | deps/amqp_client/BUILD.bazel | 7 | ||||
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel | 1 | ||||
| -rw-r--r-- | deps/rabbit_common/BUILD.bazel | 7 | ||||
| -rw-r--r-- | deps/rabbitmq_aws/BUILD.bazel | 1 | ||||
| -rw-r--r-- | workspace_helpers.bzl | 4 |
6 files changed, 17 insertions, 5 deletions
diff --git a/BUILD.ranch b/BUILD.ranch index 746712128f..7a89e08841 100644 --- a/BUILD.ranch +++ b/BUILD.ranch @@ -32,7 +32,7 @@ genrule( app_file( name = "app_file", app_name = "ranch", - app_src = ["src/ranch.app.src"], + app_version = "2.1.0", modules = [":first_beam_files", ":beam_files"], ) diff --git a/deps/amqp_client/BUILD.bazel b/deps/amqp_client/BUILD.bazel index 69b39b43d6..5fec64c732 100644 --- a/deps/amqp_client/BUILD.bazel +++ b/deps/amqp_client/BUILD.bazel @@ -40,7 +40,12 @@ rabbitmq_lib( deps = DEPS, ) -xref(tags = ["xref"]) +xref( + additional_libs = [ + "@ranch//:bazel_erlang_lib", + ], + tags = ["xref"], +) plt( name = "base_plt", diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel b/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel index 8e7bfb8891..77cc589f51 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel +++ b/deps/rabbit/apps/rabbitmq_prelaunch/BUILD.bazel @@ -28,6 +28,7 @@ rabbitmq_lib( xref( additional_libs = [ + "@ranch//:bazel_erlang_lib", "@systemd//:bazel_erlang_lib", ], tags = ["xref"], diff --git a/deps/rabbit_common/BUILD.bazel b/deps/rabbit_common/BUILD.bazel index a88ddced0a..7ecddea9fc 100644 --- a/deps/rabbit_common/BUILD.bazel +++ b/deps/rabbit_common/BUILD.bazel @@ -178,7 +178,12 @@ bazel_erlang_lib( deps = DEPS + RUNTIME_DEPS, ) -xref(tags = ["xref"]) +xref( + additional_libs = [ + "@ranch//:bazel_erlang_lib", + ], + tags = ["xref"], +) plt( name = "base_plt", diff --git a/deps/rabbitmq_aws/BUILD.bazel b/deps/rabbitmq_aws/BUILD.bazel index 9d024e867f..aba4985632 100644 --- a/deps/rabbitmq_aws/BUILD.bazel +++ b/deps/rabbitmq_aws/BUILD.bazel @@ -38,6 +38,7 @@ xref( "//deps/rabbit_common:bazel_erlang_lib", "@credentials_obfuscation//:bazel_erlang_lib", "@jsx//:bazel_erlang_lib", + "@ranch//:bazel_erlang_lib", "@recon//:bazel_erlang_lib", ], tags = ["xref"], diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl index 5efeff9bd7..923c33e063 100644 --- a/workspace_helpers.bzl +++ b/workspace_helpers.bzl @@ -224,8 +224,8 @@ erlang_lib( hex_archive( name = "ranch", - version = "2.0.0", - sha256 = "c20a4840c7d6623c19812d3a7c828b2f1bd153ef0f124cb69c54fe51d8a42ae0", + version = "2.1.0", + sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916", build_file = rabbitmq_workspace + "//:BUILD.ranch", ) |