Merge branch 'bazelbuild:main' into toolchain-platform

Author: yuzhy8701

.bcr/metadata.template.json

@@ -2,22 +2,27 @@
   "homepage": "https://github.com/bazelbuild/rules_rust",
   "maintainers": [
     {
-        "email": "[email protected]",
-        "github": "UebelAndre",
-        "name": "UebelAndre"
+      "email": "[email protected]",
+      "github": "UebelAndre",
+      "github_user_id": "26427366",
+      "name": "UebelAndre"
     },
     {
       "email": "[email protected]",
       "github": "illicitonion",
+      "github_user_id": "1131704",
       "name": "Daniel Wagner-Hall"
     },
     {
       "email": "[email protected]",
       "github": "scentini",
+      "github_user_id": "11149636",
       "name": "Rosica Dejanovska"
     }
   ],
-  "repository": ["github:bazelbuild/rules_rust"],
+  "repository": [
+    "github:bazelbuild/rules_rust"
+  ],
   "versions": [],
   "yanked_versions": {}
 }

.github/workflows/release.yaml

@@ -2,7 +2,6 @@
 name: Release
 on:
   workflow_dispatch:
-  merge_group:
   pull_request:
     branches:
       - main
@@ -28,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Ensure release does not already exist
-        if: startsWith(github.ref, 'refs/heads/main') == false
+        if: startsWith(github.ref, 'refs/heads/main')
         run: |
           git fetch origin &> /dev/null
           version="$(grep 'VERSION =' ${{ github.workspace }}/version.bzl | sed 's/VERSION = "//' | sed 's/"//')"
@@ -46,12 +45,15 @@ jobs:
       matrix:
         # Create a job for each target triple
         include:
-          - os: macOS-13
+          - os: macOS-14
             env:
               TARGET: "aarch64-apple-darwin"
           - os: ubuntu-22.04
             env:
               TARGET: "aarch64-unknown-linux-gnu"
+          - os: ubuntu-22.04
+            env:
+              TARGET: "aarch64-unknown-linux-musl"
           - os: windows-2022
             env:
               TARGET: "aarch64-pc-windows-msvc"

crate_universe/extensions.bzl

@@ -779,19 +779,19 @@ def _package_to_json(p):
         if v or k == "default_features"
     })
 
-def _get_generator(module_ctx):
+def _get_generator(module_ctx, host_triple):
     """Query Network Resources to local a `cargo-bazel` binary.
 
     Based off get_generator in crates_universe/private/generate_utils.bzl
 
     Args:
-        module_ctx (module_ctx):  The rules context object
+        module_ctx (module_ctx): The rules context object
+        host_triple (struct): A triple struct that represents the host.
 
     Returns:
         tuple(path, dict) The path to a 'cargo-bazel' binary. The pairing (dict)
             may be `None` if there is not need to update the attribute
     """
-    host_triple = get_host_triple(module_ctx)
     use_environ = False
     for var in GENERATOR_ENV_VARS:
         if var in module_ctx.os.environ:
@@ -858,8 +858,11 @@ def _get_host_cargo_rustc(module_ctx, host_triple, host_tools_repo):
 
 def _crate_impl(module_ctx):
     reproducible = True
-    generator = _get_generator(module_ctx)
-    host_triple = get_host_triple(module_ctx)
+    host_triple = get_host_triple(module_ctx, abi = {
+        "aarch64-unknown-linux": "musl",
+        "x86_64-unknown-linux": "musl",
+    })
+    generator = _get_generator(module_ctx, host_triple)
 
     all_repos = []
 

crate_universe/private/crate.bzl

@@ -135,14 +135,12 @@ def _annotation(
         build_script_data_glob (list, optional): A list of glob patterns to add to a crate's `cargo_build_script::data`
             attribute.
         build_script_deps (list, optional): A list of labels to add to a crate's `cargo_build_script::deps` attribute.
-        build_script_env (dict, optional): Additional environment variables to set on a crate's
-            `cargo_build_script::env` attribute.
+        build_script_env (dict, optional): Additional environment variables to set when running the crate's `cargo_build_script` - sets that target's `build_script_env` attribute.
         build_script_link_deps:  A list of labels to add to a crate's `cargo_build_script::link_deps` attribute.
         build_script_proc_macro_deps (list, optional): A list of labels to add to a crate's
             `cargo_build_script::proc_macro_deps` attribute.
         build_script_rundir (str, optional): An override for the build script's rundir attribute.
-        build_script_rustc_env (dict, optional): Additional environment variables to set on a crate's
-            `cargo_build_script::env` attribute.
+        build_script_rustc_env (dict, optional): Additional environment variables to set when compiling the crate's `cargo_build_script` - sets that target's `rustc_env` attribute.
         build_script_toolchains (list, optional): A list of labels to set on a crates's `cargo_build_script::toolchains` attribute.
         build_script_use_default_shell_env (int, optional): Whether or not to include the default shell environment for the build
             script action.

rust/platform/triple.bzl

@@ -86,7 +86,7 @@ def _validate_cpu_architecture(arch, expected_archs):
             expected_archs,
         ))
 
-def get_host_triple(repository_ctx, abi = None):
+def get_host_triple(repository_ctx, abi = {}):
     """Query host information for the appropriate triple to use with load_arbitrary_tool or the crate_universe resolver
 
     Example:
@@ -110,8 +110,9 @@ def get_host_triple(repository_ctx, abi = None):
 
     Args:
         repository_ctx (repository_ctx): The repository_rule's context object
-        abi (str): Since there's no consistent way to check for ABI, this info
-            may be explicitly provided
+        abi (dict): A mapping of platform triple prefixes to desired abi. This
+            is useful since there's no consistent way to check for ABI, this info
+            may be explicitly provided.
 
     Returns:
         struct: A triple struct; see the `triple` function in this module
@@ -134,9 +135,10 @@ def get_host_triple(repository_ctx, abi = None):
 
     if "linux" in repository_ctx.os.name:
         _validate_cpu_architecture(arch, supported_architectures["linux"])
-        return triple("{}-unknown-linux-{}".format(
-            arch,
-            abi or "gnu",
+        prefix = "{}-unknown-linux".format(arch)
+        return triple("{}-{}".format(
+            prefix,
+            abi.get(prefix, "gnu"),
         ))
 
     if "mac" in repository_ctx.os.name:
@@ -145,9 +147,10 @@ def get_host_triple(repository_ctx, abi = None):
 
     if "win" in repository_ctx.os.name:
         _validate_cpu_architecture(arch, supported_architectures["windows"])
-        return triple("{}-pc-windows-{}".format(
-            arch,
-            abi or "msvc",
+        prefix = "{}-pc-windows".format(arch)
+        return triple("{}-{}".format(
+            prefix,
+            abi.get(prefix, "msvc"),
         ))
 
     fail("Unhandled host os: {}", repository_ctx.os.name)

rust/rust_binary.bzl

@@ -0,0 +1,8 @@
+"""rust_binary"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_binary = "rust_binary",
+)
+
+rust_binary = _rust_binary

rust/rust_library.bzl

@@ -0,0 +1,8 @@
+"""rust_library"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_library = "rust_library",
+)
+
+rust_library = _rust_library

rust/rust_library_group.bzl

@@ -0,0 +1,8 @@
+"""rust_library_group"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_library_group = "rust_library_group",
+)
+
+rust_library_group = _rust_library_group

rust/rust_proc_macro.bzl

@@ -0,0 +1,8 @@
+"""rust_proc_macro"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_proc_macro = "rust_proc_macro",
+)
+
+rust_proc_macro = _rust_proc_macro

rust/rust_shared_library.bzl

@@ -0,0 +1,8 @@
+"""rust_shared_library"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_shared_library = "rust_shared_library",
+)
+
+rust_shared_library = _rust_shared_library

rust/rust_static_library.bzl

@@ -0,0 +1,8 @@
+"""rust_static_library"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_static_library = "rust_static_library",
+)
+
+rust_static_library = _rust_static_library

rust/rust_test.bzl

@@ -0,0 +1,8 @@
+"""rust_test"""
+
+load(
+    "//rust/private:rust.bzl",
+    _rust_test = "rust_test",
+)
+
+rust_test = _rust_test