Fixed build issues in release artifact (#1295)

* Fixed missing BUILD file from release artifact * Addressed additional issues in release artifact
bazelbuild · Apr 26, 2022 · 26fa5a1 · 26fa5a1
1 parent 48bb32f
commit 26fa5a1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/crate_universe/tools/BUILD.bazel b/crate_universe/tools/BUILD.bazel
@@ -1,6 +1,7 @@
 filegroup(
     name = "distro",
     srcs = [
+        "BUILD.bazel",
         "//crate_universe/tools/cross_installer:distro",
         "//crate_universe/tools/urls_generator:distro",
     ],

diff --git a/crate_universe/tools/cross_installer/BUILD.bazel b/crate_universe/tools/cross_installer/BUILD.bazel
@@ -30,9 +30,11 @@ cross_binary(name = "cross")
 
 filegroup(
     name = "distro",
-    srcs = [
+    srcs = glob([
+        "**/*.rs",
+        "**/*.toml",
+    ]) + [
         "BUILD.bazel",
-        "Cargo.toml",
         "cross_installer_deps.bzl",
     ],
     visibility = ["//crate_universe/tools:__pkg__"],

diff --git a/crate_universe/tools/urls_generator/BUILD.bazel b/crate_universe/tools/urls_generator/BUILD.bazel
@@ -8,7 +8,9 @@ exports_files(
 
 filegroup(
     name = "distro",
-    srcs = [
+    srcs = glob([
+        "**/*.rs",
+    ]) + [
         "BUILD.bazel",
         "Cargo.toml",
     ],

diff --git a/util/BUILD.bazel b/util/BUILD.bazel
@@ -1,6 +1,7 @@
 sh_binary(
     name = "fetch_shas",
     srcs = ["fetch_shas.sh"],
+    tags = ["manual"],
 )
 
 filegroup(

diff --git a/util/import/BUILD.bazel b/util/import/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//rust:defs.bzl", "rust_library", "rust_proc_macro", "rust_test")
 
 # buildifier: disable=bzl-visibility
@@ -70,20 +71,20 @@ config_setting(
     },
 )
 
-sh_binary(
+cc_binary(
     name = "fake_import_macro_impl",
-    srcs = ["fake_import_macro_impl.sh"],
+    srcs = ["fake_import_macro_impl.cc"],
 )
 
 filegroup(
     name = "distro",
     srcs = glob([
         "*.bzl",
         "**/*.rs",
+        "**/*.cc",
     ]) + [
         "//util/import/raze:srcs",
         "//util/import/raze/remote:srcs",
-        "fake_import_macro_impl.sh",
         "BUILD.bazel",
     ],
     visibility = ["//:__subpackages__"],

diff --git a/util/import/fake_import_macro_impl.cc b/util/import/fake_import_macro_impl.cc
@@ -0,0 +1,5 @@
+//! A noop import macro handler.
+
+int main(int argc, char** argv) {
+    return 0;
+}
diff --git a/util/import/fake_import_macro_impl.sh b/util/import/fake_import_macro_impl.sh
diff --git a/util/process_wrapper/BUILD.bazel b/util/process_wrapper/BUILD.bazel
@@ -22,10 +22,9 @@ rust_test(
 filegroup(
     name = "distro",
     srcs = glob([
+        "**/*.bazel",
         "**/*.cc",
         "**/*.rs",
-    ]) + [
-        "BUILD.bazel",
-    ],
+    ]),
     visibility = ["//:__subpackages__"],
 )