Updates for rules_erlang 2.5.0

rabbitmq_cli uses some private rules_erlang apis that have changed in the upcoming release
rabbitmq · Apr 5, 2022 · 92b18e8 · 92b18e8
1 parent 3578ea8
commit 92b18e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -59,7 +59,7 @@ rules_pkg_dependencies()
 
 git_repository(
     name = "rules_erlang",
-    commit = "04e49d17027b461864eab8dcc80ea6c298bfc331",
+    commit = "d578e82cf1c6369eff3569bf7a0040820698d99e",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
 )
 

diff --git a/deps/rabbitmq_cli/rabbitmqctl_test.bzl b/deps/rabbitmq_cli/rabbitmqctl_test.bzl
@@ -1,4 +1,8 @@
-load("@rules_erlang//:erlang_home.bzl", "ErlangHomeProvider", "ErlangVersionProvider")
+load(
+    "@rules_erlang//:erlang_home.bzl",
+    "ErlangHomeProvider",
+    "ErlangVersionProvider",
+)
 load(
     "@rules_erlang//:erlang_app_info.bzl",
     "ErlangAppInfo",
@@ -11,23 +15,26 @@ load(
     "windows_path",
 )
 load(
-    "@rules_erlang//private:ct.bzl",
-    "ERL_LIBS_DIR",
-    "code_paths",
+    "@rules_erlang//private:util.bzl",
     "erl_libs_contents",
 )
-load("//:elixir_home.bzl", "ElixirHomeProvider")
+load(
+    "//:elixir_home.bzl",
+    "ElixirHomeProvider",
+)
 
 def _impl(ctx):
     erlang_version = ctx.attr._erlang_version[ErlangVersionProvider].version
     erlang_home = ctx.attr._erlang_home[ErlangHomeProvider].path
     elixir_home = ctx.attr._elixir_home[ElixirHomeProvider].path
 
-    erl_libs_files = erl_libs_contents(ctx, headers = True)
+    erl_libs_dir = ctx.label.name + "_deps"
+
+    erl_libs_files = erl_libs_contents(ctx, headers = True, dir = erl_libs_dir)
 
     package_dir = path_join(ctx.label.workspace_root, ctx.label.package)
 
-    erl_libs_path = path_join(package_dir, ERL_LIBS_DIR)
+    erl_libs_path = path_join(package_dir, erl_libs_dir)
 
     if not ctx.attr.is_windows:
         output = ctx.actions.declare_file(ctx.label.name)