Add bzlmod crate universe to CI.

.bazelci/presubmit.yml

@@ -342,12 +342,18 @@ tasks:
       - "//..."
     build_flags: *aspects_flags
     soft_fail: yes
-  ubuntu2004_examples_bzlmod:
-    name: Bzlmod Examples
+  ubuntu2004_examples_bzlmod_hello_world:
+    name: Bzlmod hello world example
     platform: ubuntu2004
     working_directory: examples/bzlmod/hello_world
     build_targets:
       - "//..."
+  ubuntu2004_examples_bzlmod_crate_universe:
+    name: Bzlmod crate universe examples
+    platform: ubuntu2004
+    working_directory: examples/bzlmod/crate_universe
+    build_targets:
+      - "//..."
   rbe_ubuntu1604_examples:
     name: Examples
     platform: rbe_ubuntu1604

MODULE.bazel

@@ -9,7 +9,7 @@ bazel_dep(name = "bazel_skylib", version = "1.2.0")
 bazel_dep(
     name = "apple_support",
     repo_name = "build_bazel_apple_support",
-    version = "1.4.0"
+    version = "1.3.2"
 )
 
 non_bzlmod_deps = use_extension("//bzlmod/private/non_bzlmod_deps:non_bzlmod_deps.bzl", "non_bzlmod_deps")

bzlmod/private/crate/crate.bzl

@@ -7,7 +7,7 @@ load("//rust/platform:triple.bzl", "get_host_triple")
 load("//crate_universe/private:crates_vendor.bzl", "CRATES_VENDOR_ATTRS", "write_config_file", "write_splicing_manifest", _crates_vendor_repo_rule = "crates_vendor")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
-load("//bzlmod/private:symlink_repo.bzl", "symlink_repo")
+load("//bzlmod/private:generate_repo.bzl", "generate_repo")
 load("//bzlmod/private/cargo_bazel_bootstrap:cargo_bazel_bootstrap.bzl", "get_cargo_bazel_runner")
 load("//bzlmod/private/crate/tag_classes:annotation.bzl", "annotation_tags_to_json", annotation_tag = "annotation")
 load("//bzlmod/private/crate/tag_classes:from_cargo.bzl", from_cargo_tag = "from_cargo")
@@ -113,10 +113,10 @@ def _crate_impl(module_ctx):
             ])
 
             crates_dir = tag_path.get_child(repo_name)
-            symlink_repo(
+            generate_repo(
                 name = repo_name,
-                files = {
-                    "BUILD.bazel": str(crates_dir.get_child("BUILD.bazel")),
+                contents = {
+                    "BUILD.bazel": module_ctx.read(crates_dir.get_child("BUILD.bazel")),
                 },
             )
 

bzlmod/private/generate_repo.bzl

@@ -0,0 +1,10 @@
+def _generate_repo_impl(repo_ctx):
+    for path, contents in repo_ctx.attr.contents.items():
+        repo_ctx.file(path, contents)
+
+generate_repo = repository_rule(
+    implementation = _generate_repo_impl,
+    attrs = dict(
+        contents = attr.string_dict(mandatory = True),
+    ),
+)