Merge branch 'main' into patrick/bazel9

Author: patrickmscott

.github/workflows/determinism.yaml

@@ -2,23 +2,22 @@ name: Determinism
 
 on:
   workflow_dispatch:
-  pull_request:
-    types: [opened, synchronize]
-    paths:
-      - test/determinism/**
+    inputs:
+      commit:
+        description: "Git commit or branch to test (defaults to main)"
+        required: false
+        default: "main"
 
 jobs:
   check:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: macos-latest
-            work_dir: ${{ env.RUNNER_TEMP }}/r
-          - os: ubuntu-latest
-            work_dir: ${{ env.RUNNER_TEMP }}/r
-          - os: windows-latest
-            work_dir: C:\r
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - ubuntu-24.04-arm
+          - windows-latest
 
     runs-on: ${{ matrix.os }}
     name: Check (${{ matrix.os }})
@@ -28,15 +27,47 @@ jobs:
         with:
           clean: true
 
-      - name: Run tests
-        continue-on-error: true
+      - name: Choose a work directory (unix)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          echo "WORK_DIR=$RUNNER_TEMP/r" >> "$GITHUB_ENV"
+
+      - name: Choose a work directory (windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
         run: |
-          bazel run \
-            --compilation_mode=opt \
-            //test/determinism:tester \
-            -- test \
-            --output="${{ github.workspace }}/results.json" \
-            --work-dir="${{ matrix.work_dir }}"
+          'WORK_DIR=C:\r' | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+
+      - name: Run tests (unix)
+        if: runner.os != 'Windows'
+        continue-on-error: true
+        shell: bash
+        run: >-
+          bazel run
+          --compilation_mode=opt
+          //test/determinism:tester
+          --
+          test
+          --url=${{ format('{0}/{1}.git', github.server_url, github.repository) }}
+          --commit=${{ inputs.commit }}
+          --output="${{ github.workspace }}/results.json"
+          --work-dir="${WORK_DIR}"
+
+      - name: Run tests (windows)
+        if: runner.os == 'Windows'
+        continue-on-error: true
+        shell: pwsh
+        run: >-
+          bazel run
+          --compilation_mode=opt
+          //test/determinism:tester
+          '--'
+          test
+          --url=${{ format('{0}/{1}.git', github.server_url, github.repository) }}
+          --commit=${{ inputs.commit }}
+          --output="${{ github.workspace }}/results.json"
+          --work-dir="$env:WORK_DIR"
 
       - name: Summarize (unix)
         if: runner.os != 'Windows'
@@ -83,16 +114,16 @@ jobs:
         if: runner.os != 'Windows' && always()
         shell: bash
         run: |
-          if [[ -d "${{ matrix.work_dir }}/o" ]]; then
-            tar -czf output-base.tar.gz -C "${{ matrix.work_dir }}" o
+          if [[ -d "${WORK_DIR}/o" ]]; then
+            tar -czf output-base.tar.gz -C "${WORK_DIR}" o
           fi
 
       - name: Archive output base (windows)
         if: runner.os == 'Windows' && always()
         shell: pwsh
         run: |
-          if (Test-Path "${{ matrix.work_dir }}\o") {
-            Compress-Archive -Path "${{ matrix.work_dir }}\o" -DestinationPath output-base.zip
+          if (Test-Path "$env:WORK_DIR\o") {
+            Compress-Archive -Path "$env:WORK_DIR\o" -DestinationPath output-base.zip
           }
 
       - name: Upload output base artifact

.github/workflows/runfiles_release.yaml

@@ -0,0 +1,47 @@
+---
+name: Release Runfiles
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - rust/runfiles/Cargo.toml
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  validation:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      # TODO: Unfortunately it's not obvious how to restrict `workflow_dispatch` to a particular branch
+      # so this step ensures releases are always done off of `main`.
+      - name: Ensure branch is 'main'
+        run: |
+          git fetch origin &> /dev/null
+          branch="$(git rev-parse --abbrev-ref HEAD)"
+          if [[ "${branch}" != "main" ]]; then
+            echo "The release branch must be main. Got '${branch}'' instead." >&2
+            exit 1
+          else
+            echo "Branch is '${branch}'"
+          fi
+  builds:
+    needs: validation
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install rust toolchains for host
+        run: |
+          # Detect the current version of rust
+          version="$(grep 'DEFAULT_RUST_VERSION =' ./rust/private/common.bzl | grep -o '[[:digit:].]\+')"
+          rustup override set "${version}"
+          rustup update stable && rustup default stable
+      - name: Publish to crates.io
+        run: cargo publish --token ${CRATES_TOKEN}
+        working-directory: ./rust/runfiles
+        env:
+          CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }}

MODULE.bazel

@@ -21,14 +21,14 @@ internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
 use_repo(
     internal_deps,
     "rrra",
-    "rrra__anyhow-1.0.71",
-    "rrra__camino-1.1.9",
-    "rrra__clap-4.3.11",
-    "rrra__env_logger-0.10.0",
-    "rrra__itertools-0.11.0",
-    "rrra__log-0.4.19",
-    "rrra__serde-1.0.171",
-    "rrra__serde_json-1.0.102",
+    "rrra__anyhow-1.0.102",
+    "rrra__camino-1.2.2",
+    "rrra__clap-4.6.0",
+    "rrra__env_logger-0.11.10",
+    "rrra__itertools-0.14.0",
+    "rrra__log-0.4.29",
+    "rrra__serde-1.0.228",
+    "rrra__serde_json-1.0.149",
     "rules_rust_tinyjson",
 )
 
@@ -112,7 +112,7 @@ use_repo(
     "cui__cargo-lock-10.1.0",
     "cui__cargo-platform-0.1.9",
     "cui__cargo_metadata-0.19.2",
-    "cui__cargo_toml-0.22.1",
+    "cui__cargo_toml-0.22.3",
     "cui__cfg-expr-0.18.0",
     "cui__clap-4.5.37",
     "cui__crates-index-3.7.0",
@@ -134,7 +134,7 @@ use_repo(
     "cui__tempfile-3.19.1",
     "cui__tera-1.20.0",
     "cui__textwrap-0.16.2",
-    "cui__toml-0.8.21",
+    "cui__toml-0.9.5",
     "cui__tracing-0.1.41",
     "cui__tracing-subscriber-0.3.19",
     "cui__url-2.5.4",

cargo/tests/cargo_build_script/run_from_exec_root/build.rs

@@ -1,5 +1,6 @@
 fn main() {
-    let contents = std::fs::read_to_string("cargo/tests/cargo_build_script/run_from_exec_root/data.txt")
-        .expect("Failed to read data file");
+    let contents =
+        std::fs::read_to_string("cargo/tests/cargo_build_script/run_from_exec_root/data.txt")
+            .expect("Failed to read data file");
     println!("cargo:rustc-env=DATA={}", contents);
 }

cargo/tests/cargo_build_script/transitive_data/BUILD.bazel

@@ -0,0 +1,5 @@
+load(":transitive_data_test.bzl", "transitive_cbs_data_test_suite")
+
+transitive_cbs_data_test_suite(
+    name = "transitive_cbs_data_test_suite",
+)

cargo/tests/cargo_build_script/transitive_data/transitive_data_test.bzl

@@ -0,0 +1,115 @@
+"""Tests documenting that cargo_build_script `data` files currently act as both
+compile_data and runtime data -- they appear in Rustc compile action inputs for
+both the direct library and transitive dependents.
+
+See https://github.com/bazelbuild/rules_rust/issues/3609 for context."""
+
+load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
+load("//cargo:defs.bzl", "cargo_build_script")
+load("//rust:defs.bzl", "rust_library")
+
+def _cbs_data_in_rustc_inputs_impl(ctx):
+    env = analysistest.begin(ctx)
+    target = analysistest.target_under_test(env)
+
+    rustc_action = None
+    for action in target.actions:
+        if action.mnemonic == "Rustc":
+            rustc_action = action
+            break
+
+    asserts.false(env, rustc_action == None, "Expected a Rustc action")
+
+    # cargo_build_script `data` currently flows into BuildInfo.compile_data
+    # via script_data, so it appears in Rustc action inputs for both the
+    # direct dependent and transitive dependents. This documents that
+    # CBS `data` effectively acts as both compile_data and data today.
+    data_inputs = [i for i in rustc_action.inputs.to_list() if "cbs_data_dep.txt" in i.path]
+    asserts.true(
+        env,
+        len(data_inputs) > 0,
+        "Expected CBS data file to appear in Rustc action inputs (CBS data currently acts as compile_data)",
+    )
+
+    return analysistest.end(env)
+
+cbs_data_in_rustc_inputs_test = analysistest.make(
+    _cbs_data_in_rustc_inputs_impl,
+)
+
+def _define_test_targets():
+    write_file(
+        name = "cbs_data_dep_file",
+        out = "cbs_data_dep.txt",
+        content = ["data for build script", ""],
+        newline = "unix",
+    )
+
+    write_file(
+        name = "build_rs_src",
+        out = "build.rs",
+        content = ["fn main() {}", ""],
+        newline = "unix",
+    )
+
+    cargo_build_script(
+        name = "build_script",
+        srcs = [":build.rs"],
+        data = [":cbs_data_dep.txt"],
+        edition = "2021",
+    )
+
+    write_file(
+        name = "lib_src",
+        out = "lib.rs",
+        content = ["pub fn hello() {}", ""],
+        newline = "unix",
+    )
+
+    rust_library(
+        name = "lib",
+        srcs = [":lib.rs"],
+        deps = [":build_script"],
+        edition = "2021",
+    )
+
+    write_file(
+        name = "bin_src",
+        out = "bin.rs",
+        content = ["extern crate lib;", ""],
+        newline = "unix",
+    )
+
+    rust_library(
+        name = "bin",
+        srcs = [":bin.rs"],
+        deps = [":lib"],
+        edition = "2021",
+    )
+
+def transitive_cbs_data_test_suite(name):
+    """Entry-point macro called from the BUILD file.
+
+    Args:
+        name (str): Name of the macro.
+    """
+    _define_test_targets()
+
+    cbs_data_in_rustc_inputs_test(
+        name = "cbs_data_in_lib_compile_inputs_test",
+        target_under_test = ":lib",
+    )
+
+    cbs_data_in_rustc_inputs_test(
+        name = "cbs_data_in_bin_compile_inputs_test",
+        target_under_test = ":bin",
+    )
+
+    native.test_suite(
+        name = name,
+        tests = [
+            ":cbs_data_in_lib_compile_inputs_test",
+            ":cbs_data_in_bin_compile_inputs_test",
+        ],
+    )