Correctly include json and csv cli deps in :source_archive

rabbitmq · Mar 14, 2023 · 5ebd7b8 · 5ebd7b8
1 parent 6209180
commit 5ebd7b8
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/dist.bzl b/dist.bzl
@@ -326,23 +326,32 @@ def source_archive(
         prefix = "deps",
     )
 
-    pkg_tar(
-        name = "cli-deps-archive",
-        deps = [
-            Label("@rabbitmq-server//deps/rabbitmq_cli:fetched_srcs"),
+    pkg_files(
+        name = "json-files",
+        srcs = [
+            "@json//:sources",
         ],
-        package_dir = "deps/rabbitmq_cli",
+        strip_prefix = "",
+        prefix = "deps/json",
+    )
+
+    pkg_files(
+        name = "csv-files",
+        srcs = [
+            "@csv//:sources",
+        ],
+        strip_prefix = "",
+        prefix = "deps/csv",
     )
 
     pkg_tar(
         name = name,
         extension = "tar.xz",
         srcs = [
             ":deps-files",
+            ":json-files",
+            ":csv-files",
             Label("@rabbitmq-server//:root-licenses"),
         ],
-        deps = [
-            ":cli-deps-archive",
-        ],
         visibility = ["//visibility:public"],
     )