Merge pull request #10338 from rabbitmq/bazel-7-fixes

Bazel 7 fixes
rabbitmq · Mar 20, 2024 · 90ae3e9 · 90ae3e9
2 parents a04b092 + 5e1983a
commit 90ae3e9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.4.0
+latest
diff --git a/bazel/elixir/elixir_as_app.bzl b/bazel/elixir/elixir_as_app.bzl
@@ -21,7 +21,7 @@ def _impl(ctx):
         outputs = [ebin],
         command = """set -euo pipefail
 
-cp -r "{elixir_home}"/lib/{app}/ebin/* {ebin}
+cp -RL "{elixir_home}"/lib/{app}/ebin/* {ebin}
 """.format(
             elixir_home = elixir_home,
             app = ctx.attr.app,

diff --git a/deps/rabbitmq_cli/rabbitmqctl.bzl b/deps/rabbitmq_cli/rabbitmqctl.bzl
@@ -34,6 +34,19 @@ ElixirAppInfo = provider(
     },
 )
 
+def _copy(ctx, src, dst):
+    ctx.actions.run_shell(
+        inputs = [src],
+        outputs = [dst],
+        command = """set -euo pipefail
+
+cp -RL "{src}" "{dst}"
+""".format(
+            src = src.path,
+            dst = dst.path,
+        ),
+    )
+
 def deps_dir_contents(ctx, deps, dir):
     files = []
     for dep in deps:
@@ -51,15 +64,7 @@ def deps_dir_contents(ctx, deps, dir):
                 lib_info.app_name,
                 rp,
             ))
-            args = ctx.actions.args()
-            args.add(src)
-            args.add(f)
-            ctx.actions.run(
-                inputs = [src],
-                outputs = [f],
-                executable = "cp",
-                arguments = [args],
-            )
+            _copy(ctx, src, f)
             files.append(f)
         for beam in lib_info.beam:
             if not beam.is_directory:
@@ -69,15 +74,7 @@ def deps_dir_contents(ctx, deps, dir):
                     "ebin",
                     beam.basename,
                 ))
-                args = ctx.actions.args()
-                args.add(beam)
-                args.add(f)
-                ctx.actions.run(
-                    inputs = [beam],
-                    outputs = [f],
-                    executable = "cp",
-                    arguments = [args],
-                )
+                _copy(ctx, beam, f)
                 files.append(f)
             else:
                 fail("unexpected directory in", lib_info)
@@ -158,8 +155,8 @@ done
 
 cp escript/rabbitmqctl ${{ABS_ESCRIPT_PATH}}
 
-cp _build/${{MIX_ENV}}/lib/rabbitmqctl/ebin/* ${{ABS_EBIN_DIR}}
-cp _build/${{MIX_ENV}}/lib/rabbitmqctl/consolidated/* ${{ABS_CONSOLIDATED_DIR}}
+cp -RL _build/${{MIX_ENV}}/lib/rabbitmqctl/ebin/* ${{ABS_EBIN_DIR}}
+cp -RL _build/${{MIX_ENV}}/lib/rabbitmqctl/consolidated/* ${{ABS_CONSOLIDATED_DIR}}
 
 # remove symlinks from the _build directory since it
 # is not used, and bazel does not allow them