rules_erlang 3.9.0 compatibilitymergify/bp/v3.11.x/pr-6917

the elixir toolchain uses some private apis, and needed updating to
match internal changes in rules_erlang

(cherry picked from commit 2cd020a0da84702e23893d0d9a7bdccbc3f37702)

Improve finding of the location of the secondary umbrella

in integration tests

(cherry picked from commit 1316f255d903a66965d12a257d6c0fee0bb178fc)

Use regular Bazel Central Registry (BCR) for bazel modules

instead of our fork

(cherry picked from commit a3e57b9fad88cfc82930bd654a41a83fa33dbdf2)

5 files changed, 14 insertions, 22 deletions

diff --git a/.bazelrc b/.bazelrc
index 879c230bac..f54ac024f6 100644
--- a/.bazelrc
+++ b/.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
diff --git a/MODULE.bazel b/MODULE.bazel
index 0a69cf2d9b..9fb4c84b72 100644
--- a/MODULE.bazel
+++ b/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(
diff --git a/WORKSPACE b/WORKSPACE
index 018b966f70..35f1d1b2dc 100644
--- a/WORKSPACE
+++ b/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(
diff --git a/bazel/elixir/elixir_toolchain.bzl b/bazel/elixir/elixir_toolchain.bzl
index 1274bfcaaf..e96e56c5f7 100644
--- a/bazel/elixir/elixir_toolchain.bzl
+++ b/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,
         )
diff --git a/rabbitmq.bzl b/rabbitmq.bzl
index b49d10b648..e26768162b 100644
--- a/rabbitmq.bzl
+++ b/rabbitmq.bzl
@@ -277,13 +277,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.10/rabbitmq-run)",
+            "RABBITMQ_RUN_SECONDARY": "$(location @rabbitmq-server-generic-unix-3.10//:rabbitmq-run)",
             "LANG": "C.UTF-8",
         }.items() + test_env.items()),
         tools = [