diff options
| -rw-r--r-- | MODULE.bazel | 10 | ||||
| -rw-r--r-- | WORKSPACE | 7 | ||||
| -rw-r--r-- | bazel/BUILD.hex | 15 | ||||
| -rw-r--r-- | bazel/bzlmod/extensions.bzl | 30 | ||||
| -rw-r--r-- | deps/rabbitmq_cli/BUILD.bazel | 8 | ||||
| -rw-r--r-- | dist.bzl | 10 |
6 files changed, 50 insertions, 30 deletions
diff --git a/MODULE.bazel b/MODULE.bazel index 4cd2f3935c..8e98d7a038 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -467,3 +467,13 @@ use_repo( secondary_umbrella, "rabbitmq-server-generic-unix-3.11", ) + +hex = use_extension( + "//bazel/bzlmod:extensions.bzl", + "hex", +) + +use_repo( + hex, + "hex", +) @@ -206,10 +206,3 @@ git_repository( branch = "linux-rbe", remote = "https://github.com/rabbitmq/rbe-erlang-platform.git", ) - -http_archive( - name = "hex", - strip_prefix = "hex-2.0.5", - urls = ["https://github.com/hexpm/hex/archive/refs/tags/v2.0.5.zip"], - build_file = "@rabbitmq-server//bazel:BUILD.hex", -) diff --git a/bazel/BUILD.hex b/bazel/BUILD.hex deleted file mode 100644 index d0e5113a20..0000000000 --- a/bazel/BUILD.hex +++ /dev/null @@ -1,15 +0,0 @@ -load( - "@rabbitmq-server//bazel/elixir:mix_archive_build.bzl", - "mix_archive_build", -) - -mix_archive_build( - name = "archive", - srcs = [ - "mix.exs", - ] + glob([ - "lib/**/*", - ]), - out = "hex.ez", - visibility = ["//visibility:public"], -) diff --git a/bazel/bzlmod/extensions.bzl b/bazel/bzlmod/extensions.bzl index ddc10c8ef8..bb87dc9cde 100644 --- a/bazel/bzlmod/extensions.bzl +++ b/bazel/bzlmod/extensions.bzl @@ -1,3 +1,4 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load( ":secondary_umbrella.bzl", @@ -137,3 +138,32 @@ def _secondary_umbrella(ctx): secondary_umbrella = module_extension( implementation = _secondary_umbrella, ) + +def _hex(ctx): + http_archive( + name = "hex", + sha256 = "0e3e3290d0fcbdc6bb0526b73ca174d68dcff4d53ee86015c49ad0493e39ee65", + strip_prefix = "hex-2.0.5", + urls = ["https://github.com/hexpm/hex/archive/refs/tags/v2.0.5.zip"], + build_file_content = """\ +load( + "@rabbitmq-server//bazel/elixir:mix_archive_build.bzl", + "mix_archive_build", +) + +mix_archive_build( + name = "archive", + srcs = [ + "mix.exs", + ] + glob([ + "lib/**/*", + ]), + out = "hex.ez", + visibility = ["//visibility:public"], +) +""", + ) + +hex = module_extension( + implementation = _hex, +) diff --git a/deps/rabbitmq_cli/BUILD.bazel b/deps/rabbitmq_cli/BUILD.bazel index 5e7ad0b5de..bcb244f441 100644 --- a/deps/rabbitmq_cli/BUILD.bazel +++ b/deps/rabbitmq_cli/BUILD.bazel @@ -1,4 +1,3 @@ -load("@bazel_skylib//rules:select_file.bzl", "select_file") load("@rules_erlang//:dialyze.bzl", "dialyze", "plt") load(":rabbitmqctl.bzl", "rabbitmqctl") load(":rabbitmqctl_check_formatted.bzl", "rabbitmqctl_check_formatted_test") @@ -33,13 +32,6 @@ rabbitmqctl( }, ) -select_file( - name = "fetched_srcs", - srcs = ":rabbitmqctl", - subpath = "deps.tar", - visibility = ["//visibility:public"], -) - rabbitmq_home( name = "broker-for-cli-tests-home", testonly = True, @@ -344,6 +344,15 @@ def source_archive( prefix = "deps/csv", ) + pkg_files( + name = "parallel_stream-files", + srcs = [ + "@parallel_stream//:sources", + ], + strip_prefix = "", + prefix = "deps/parallel_stream", + ) + pkg_tar( name = name, extension = "tar.xz", @@ -351,6 +360,7 @@ def source_archive( ":deps-files", ":json-files", ":csv-files", + ":parallel_stream-files", Label("@rabbitmq-server//:root-licenses"), ], visibility = ["//visibility:public"], |