Merge pull request #6917 from rabbitmq/use-rules_erlang-3.9.0

Use rules_erlang 3.9.0

.bazelrc

@@ -1,5 +1,4 @@
-build --experimental_enable_bzlmod
-build --registry=https://raw.githubusercontent.com/rabbitmq/bazel-central-registry/dev/
+build --enable_bzlmod
 
 build --incompatible_strict_action_env
 build --local_test_jobs=1

MODULE.bazel

@@ -25,7 +25,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.8.5",
+    version = "3.9.0",
 )
 
 erlang_config = use_extension(

WORKSPACE

@@ -119,7 +119,7 @@ git_repository(
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.8.5",
+    tag = "3.9.0",
 )
 
 load(

bazel/elixir/elixir_toolchain.bzl

@@ -30,16 +30,16 @@ def _build_info(ctx):
 
 def erlang_dirs(ctx):
     info = _build_info(ctx)
-    if info.release_dir != None:
+    if info.release_dir_tar != None:
         runfiles = ctx.runfiles([
-            info.release_dir,
+            info.release_dir_tar,
             info.version_file,
         ])
     else:
         runfiles = ctx.runfiles([
             info.version_file,
         ])
-    return (info.erlang_home, info.release_dir, runfiles)
+    return (info.erlang_home, info.release_dir_tar, runfiles)
 
 def elixir_dirs(ctx, short_path = False):
     info = ctx.toolchains[":toolchain_type"].elixirinfo
@@ -51,15 +51,14 @@ def elixir_dirs(ctx, short_path = False):
 
 def maybe_install_erlang(ctx, short_path = False):
     info = _build_info(ctx)
-    release_dir = info.release_dir
-    if release_dir == None:
+    release_dir_tar = info.release_dir_tar
+    if release_dir_tar == None:
         return ""
     else:
-        return """mkdir -p $(dirname "{erlang_home}")
-cp -r {erlang_release_dir} "{erlang_home}"
-ERTS_DIRNAME="$(basename "$(echo "{erlang_home}"/erts-*)")"
-ln -sf ../$ERTS_DIRNAME/bin/epmd "{erlang_home}"/bin/epmd
-""".format(
-            erlang_release_dir = release_dir.short_path if short_path else release_dir.path,
+        return """\
+tar --extract \\
+    --directory / \\
+    --file {release_tar}""".format(
+            release_tar = release_dir_tar.short_path if short_path else release_dir_tar.path,
             erlang_home = info.erlang_home,
         )

rabbitmq.bzl

@@ -279,13 +279,7 @@ def rabbitmq_integration_suite(
             "RABBITMQCTL": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmqctl".format(package),
             "RABBITMQ_PLUGINS": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-plugins".format(package),
             "RABBITMQ_QUEUES": "$TEST_SRCDIR/$TEST_WORKSPACE/{}/broker-for-tests-home/sbin/rabbitmq-queues".format(package),
-
-            # The following variations were observed on different
-            # versions of bazel and in different environments:
-            # - _main~secondary_umbrella~rabbitmq-server-generic-unix-3.11
-            # -     @~secondary_umbrella~rabbitmq-server-generic-unix-3.11
-            # -      .secondary_umbrella.rabbitmq-server-generic-unix-3.11
-            "RABBITMQ_RUN_SECONDARY": "$(ls $TEST_SRCDIR/*secondary_umbrella*rabbitmq-server-generic-unix-3.11/rabbitmq-run)",
+            "RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-3.11//:rabbitmq-run)",
             "LANG": "C.UTF-8",
         }.items() + test_env.items()),
         tools = [