Merge pull request #5025 from rabbitmq/fix-rabbitmqctl-missing-libs

Fixup rabbitmqctl build for missing formatters & otp 25
rabbitmq · Jun 13, 2022 · 4fd20ad · 4fd20ad
2 parents 247a5ba + 1633c00
commit 4fd20ad
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 469 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -7,8 +7,8 @@ bazel_dep(name = "rules_erlang", version = "3.0.1")
 
 archive_override(
     module_name = "rules_erlang",
-    urls = ["https://github.com/rabbitmq/rules_erlang/archive/refs/tags/3.1.0.zip"],
-    strip_prefix = "rules_erlang-3.1.0",
+    urls = ["https://github.com/rabbitmq/rules_erlang/archive/refs/tags/3.2.0.zip"],
+    strip_prefix = "rules_erlang-3.2.0",
 )
 
 erlang_package = use_extension(
@@ -287,61 +287,3 @@ use_repo(
     "systemd",
     "trust_store_http",
 )
-
-elixir = use_extension(
-    "//bazel/bzlmod:extensions.bzl",
-    "elixir",
-)
-
-elixir.hex_package(
-    name = "amqp",
-    version = "2.1.2",
-    sha256 = "535901c611a979221d045839e9e7a661bf33d04590b796c8fa30f487511fde04",
-    deps = [
-        "@//deps/amqp_client:erlang_app",
-    ],
-)
-
-elixir.hex_package(
-    name = "csv",
-    version = "2.4.1",
-    sha256 = "54508938ac67e27966b10ef49606e3ad5995d665d7fc2688efb3eab1307c9079",
-    deps = [
-        "@parallel_stream//:elixir_app",
-    ],
-)
-
-elixir.hex_package(
-    name = "json",
-    version = "1.4.1",
-    sha256 = "9abf218dbe4ea4fcb875e087d5f904ef263d012ee5ed21d46e9dbca63f053d16",
-)
-
-elixir.hex_package(
-    name = "parallel_stream",
-    version = "1.0.6",
-    sha256 = "639b2e8749e11b87b9eb42f2ad325d161c170b39b288ac8d04c4f31f8f0823eb",
-)
-
-elixir.hex_package(
-    name = "temp",
-    version = "0.4.7",
-    sha256 = "6af19e7d6a85a427478be1021574d1ae2a1e1b90882586f06bde76c63cd03e0d",
-)
-
-elixir.hex_package(
-    name = "x509",
-    version = "0.7.0",
-    sha256 = "5ff9c79e77d64a62ccffd90aaeb23e8f5b6e47844ef7bc8fed931ecf238662e0",
-)
-
-use_repo(
-    elixir,
-    "amqp",
-    "csv",
-    "hex",
-    "json",
-    "parallel_stream",
-    "temp",
-    "x509",
-)
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -55,7 +55,7 @@ git_repository(
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.1.0",
+    tag = "3.2.0",
 )
 
 load(

diff --git a/bazel/bzlmod/BUILD.bazel b/bazel/bzlmod/BUILD.bazel
diff --git a/bazel/bzlmod/extensions.bzl b/bazel/bzlmod/extensions.bzl
diff --git a/bazel/mix/BUILD.bazel b/bazel/mix/BUILD.bazel
diff --git a/bazel/mix/mix_app.bzl b/bazel/mix/mix_app.bzl
diff --git a/deps/rabbitmq_cli/BUILD.bazel b/deps/rabbitmq_cli/BUILD.bazel
@@ -16,11 +16,6 @@ rabbitmqctl(
     visibility = ["//visibility:public"],
     deps = [
         "//deps/rabbit_common:erlang_app",
-        "@csv//:elixir_app",
-        "@hex//:elixir_app",
-        "@json//:elixir_app",
-        "@observer_cli//:erlang_app",
-        "@stdout_formatter//:erlang_app",
     ],
 )
 
@@ -60,13 +55,5 @@ rabbitmqctl_test(
         "//deps/amqp_client:erlang_app",
         "//deps/rabbit:erlang_app",
         "//deps/rabbit_common:erlang_app",
-        "@amqp//:elixir_app",
-        "@csv//:elixir_app",
-        "@hex//:elixir_app",
-        "@json//:elixir_app",
-        "@observer_cli//:erlang_app",
-        "@stdout_formatter//:erlang_app",
-        "@temp//:elixir_app",
-        "@x509//:elixir_app",
     ],
 )