Add release date for v1.0.0

This protects against changes to the Docker images that `cross` uses.

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Lint
+
+on: [push, pull_request]
+
+env:
+  GITHUB_TOKEN: ${{ github.token }}
+
+jobs:
+  lint:
+    name: Check that code is lint clean using precious
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install mise
+        run: |
+          set -e
+          set -x
+          curl https://mise.run | sh
+          mise install
+      - name: Run precious
+        run: |
+          mise exec -- precious lint -a

.github/workflows/test.yml

@@ -5,203 +5,302 @@ on:
   pull_request:
 
 jobs:
-  test:
-    name: Test
+  test-action:
+    name: Test action
     strategy:
       fail-fast: false
       matrix:
         platform:
           - platform_name: FreeBSD-x86_64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: x86_64-unknown-freebsd
-            expect_cross: true
-            expect_file: "x86-64.+FreeBSD"
-            expect_stripped: false
-            can_test: false
+            cache-cross-binary: true
+            expect_file_re: "x86-64.+FreeBSD"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: false
 
           - platform_name: Linux-x86_64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: x86_64-unknown-linux-musl
-            expect_cross: false
-            expect_file: "ELF.+x86-64"
-            expect_stripped: true
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "ELF.+x86-64"
+            expect_cross: ""
+            expect_stripped: "--expect-stripped"
+            can_execute: true
 
           - platform_name: Linux-aarch64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: aarch64-unknown-linux-musl
-            expect_cross: true
-            expect_file: "aarch64"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
+
+          - platform_name: Linux-aarch64 (no cache)
+            runs-on: ubuntu-22.04
+            target: aarch64-unknown-linux-musl
+            cache-cross-binary: false
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
+
+          - platform_name: Linux-aarch64 with cross v0.2.3
+            runs-on: ubuntu-22.04
+            target: aarch64-unknown-linux-musl
+            cross-version: "v0.2.3"
+            cache-cross-binary: true
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_cross_version: "0.2.3"
+            expect_stripped: ""
+            can_execute: true
+
+          - platform_name: Linux-aarch64 with cross v0.2.3 (no cache)
+            runs-on: ubuntu-22.04
+            target: aarch64-unknown-linux-musl
+            cross-version: "v0.2.3"
+            cache-cross-binary: false
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_cross_version: "0.2.3"
+            expect_stripped: ""
+            can_execute: true
+
+          - platform_name: Linux-aarch64 with cross 19be834
+            runs-on: ubuntu-22.04
+            target: aarch64-unknown-linux-musl
+            cross-version: "19be834"
+            cache-cross-binary: true
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_cross_version: "19be834"
+            expect_stripped: ""
+            can_execute: true
+
+          - platform_name: Linux-aarch64 with cross 19be834
+            runs-on: ubuntu-22.04
+            target: aarch64-unknown-linux-musl
+            cross-version: "19be834"
+            cache-cross-binary: false
+            expect_file_re: "aarch64"
+            expect_cross: "--expect-cross"
+            expect_cross_version: "19be834"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-arm
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: arm-unknown-linux-musleabi
-            expect_cross: true
-            expect_file: "32.+ARM"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "32.+ARM"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-i586
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: i586-unknown-linux-musl
-            expect_cross: false
-            expect_file: "ELF.+80386"
-            expect_stripped: true
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "ELF.+80386"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
-          - platform_name: Linux-mips
-            os: ubuntu-20.04
-            target: mips-unknown-linux-musl
-            expect_cross: true
-            expect_file: "MIPS32.+mips-"
-            expect_stripped: false
-            can_test: true
-
-          - platform_name: Linux-mipsel
-            os: ubuntu-20.04
-            target: mipsel-unknown-linux-musl
-            expect_cross: true
-            expect_file: "MIPS32.+mipsel-"
-            expect_stripped: false
-            can_test: true
-
-          - platform_name: Linux-mips64
-            os: ubuntu-20.04
-            target: mips64-unknown-linux-muslabi64
-            expect_cross: true
-            expect_file: "MIPS64"
-            expect_stripped: false
-            can_test: true
-
-          - platform_name: Linux-mips64el
-            os: ubuntu-20.04
-            target: mips64el-unknown-linux-muslabi64
-            expect_cross: true
-            expect_file: "MIPS64"
-            expect_stripped: false
-            can_test: true
+          - platform_name: Linux-i686
+            runs-on: ubuntu-22.04
+            target: i686-unknown-linux-musl
+            cache-cross-binary: true
+            expect_file_re: "ELF.+80386"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-powerpc
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: powerpc-unknown-linux-gnu
-            expect_cross: true
-            expect_file: "32.+PowerPC"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "32.+PowerPC"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-powerpc64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: powerpc64-unknown-linux-gnu
-            expect_cross: true
-            expect_file: "64.+PowerPC"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "64.+PowerPC"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-powerpc64le
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: powerpc64le-unknown-linux-gnu
-            expect_cross: true
-            expect_file: "64.+PowerPC"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "64.+PowerPC"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-riscv64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: riscv64gc-unknown-linux-gnu
-            expect_cross: true
-            expect_file: "64.+RISC-V"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "64.+RISC-V"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: Linux-s390x
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: s390x-unknown-linux-gnu
-            expect_cross: true
-            expect_file: "64.+S/390"
-            expect_stripped: false
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "64.+S/390"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: true
 
           - platform_name: NetBSD-x86_64
-            os: ubuntu-20.04
+            runs-on: ubuntu-22.04
             target: x86_64-unknown-netbsd
-            expect_cross: true
-            expect_file: "x86-64.+NetBSD"
-            expect_stripped: false
-            can_test: false
+            cache-cross-binary: true
+            expect_file_re: "x86-64.+NetBSD"
+            expect_cross: "--expect-cross"
+            expect_stripped: ""
+            can_execute: false
 
           - platform_name: Windows-aarch64
-            os: windows-latest
+            runs-on: windows-latest
             target: aarch64-pc-windows-msvc
-            expect_cross: false
-            expect_file: "Aarch64.+Windows"
-            expect_stripped: false
-            can_test: false
+            cache-cross-binary: true
+            expect_file_re: "Aarch64.+Windows"
+            expect_cross: ""
+            expect_stripped: ""
+            can_execute: false
 
           - platform_name: Windows-i686
-            os: windows-latest
+            runs-on: windows-latest
             target: i686-pc-windows-msvc
-            expect_cross: false
-            expect_file: "80386.+Windows"
-            expect_stripped: true
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "80386.+Windows"
+            expect_cross: ""
+            expect_stripped: "--expect-stripped"
+            can_execute: true
 
           - platform_name: Windows-x86_64
-            os: windows-latest
+            runs-on: windows-latest
             target: x86_64-pc-windows-msvc
-            expect_cross: false
-            expect_file: "x86-64.+Windows"
-            expect_stripped: true
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "x86-64.+Windows"
+            expect_stripped: "--expect-stripped"
+            can_execute: true
 
           - platform_name: macOS-x86_64
-            os: macOS-latest
+            runs-on: macOS-latest
             target: x86_64-apple-darwin
-            expect_cross: false
-            expect_file: "Mach-O.+x86_64"
-            expect_stripped: true
-            can_test: true
+            cache-cross-binary: true
+            expect_file_re: "Mach-O.+x86_64"
+            expect_cross: ""
+            expect_stripped: "--expect-stripped"
+            can_execute: true
 
           - platform_name: macOS-aarch64
-            os: macOS-latest
+            runs-on: macOS-latest
             target: aarch64-apple-darwin
-            expect_cross: false
-            expect_file: "Mach-O.+arm64"
-            expect_stripped: true
-            can_test: false
+            cache-cross-binary: true
+            expect_file_re: "Mach-O.+arm64"
+            expect_cross: ""
+            expect_stripped: "--expect-stripped"
+            can_execute: false
 
-    runs-on: ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.runs-on }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Copy test project to root
         shell: bash
         run: |
           cp -a test-project/* .
           rm -fr test-project
       - name: Run both commands
-        uses: "houseabsolute/actions-rust-cross@v0"
+        uses: ./
         with:
           command: both
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
           target: ${{ matrix.platform.target }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ matrix.platform.can_test }}
+        if: ${{ matrix.platform.can_execute }}
       - name: Run test command
-        uses: "houseabsolute/actions-rust-cross@v0"
+        uses: ./
         with:
           command: test
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
           target: ${{ matrix.platform.target }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ matrix.platform.can_test }}
+        if: ${{ matrix.platform.can_execute }}
+      - name: Run test command with args
+        uses: ./
+        with:
+          command: test
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
+          target: ${{ matrix.platform.target }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          args: "-- --ignored"
+        if: ${{ matrix.platform.can_execute }}
       - name: Run build command
-        uses: "houseabsolute/actions-rust-cross@v0"
+        uses: ./
         with:
           command: build
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
           target: ${{ matrix.platform.target }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           strip: true
+      - name: Run build command for subdir
+        uses: ./
+        with:
+          command: build
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
+          working-directory: subcrate
+          target: ${{ matrix.platform.target }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          strip: true
+      - name: Run bench command
+        uses: ./
+        with:
+          command: bench
+          cross-version: ${{ matrix.platform.cross-version }}
+          cache-cross-binary: ${{ matrix.platform.cache-cross-binary }}
+          target: ${{ matrix.platform.target }}
+          working-directory: bench
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ matrix.platform.can_execute }}
       - name: Check binary and cross on ${{ matrix.platform.platform_name }}
         shell: bash
         run: |
-          tests/check-binary.sh "${{ matrix.platform.target }}" "${{ matrix.platform.expect_cross }}" "${{ matrix.platform.expect_file }}" "${{ matrix.platform.expect_stripped }}"
+          set -e
+          set -x
+          cargo run --manifest-path ./run-tests/Cargo.toml -- \
+              --checkout-root "$PWD" \
+              --target "${{ matrix.platform.target }}" \
+              --expect-file-re "${{ matrix.platform.expect_file_re }}" \
+              --expect-cross-version "${{ matrix.platform.expect_cross_version }}" \
+              ${{ matrix.platform.expect_cross }} \
+              ${{ matrix.platform.expect_stripped }}
+
+  test-validate-inputs:
+    name: Test validate-inputs
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run tests
+        shell: bash
+        run: ./validate-inputs.py --test

.gitignore

@@ -3,4 +3,5 @@
 /package.json
 .\#*
 \#*\#
-test-project/target/**
+run-tests/**/target/**
+test-project/**/target/**

CODE_OF_CONDUCT.md

@@ -2,17 +2,15 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age,
-body size, disability, ethnicity, gender identity and expression, level of
-experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers
+pledge to making participation in our project and our community a harassment-free experience for
+everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level
+of experience, education, socio-economic status, nationality, personal appearance, race, religion,
+or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to creating a positive environment include:
 
 - Using welcoming and inclusive language
 - Being respectful of differing viewpoints and experiences
@@ -22,53 +20,46 @@ include:
 
 Examples of unacceptable behavior by participants include:
 
-- The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
 - Trolling, insulting/derogatory comments, and personal or political attacks
 - Public or private harassment
-- Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+- Publishing others' private information, such as a physical or electronic address, without explicit
+  permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are
+expected to take appropriate and fair corrective action in response to any instances of unacceptable
+behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
+code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or
+to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an
-appointed representative at an online or offline event. Representation of a
-project may be further defined and clarified by project maintainers.
+This Code of Conduct applies both within project spaces and in public spaces when an individual is
+representing the project or its community. Examples of representing a project or community include
+using an official project e-mail address, posting via an official social media account, or acting as
+an appointed representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at autarch@urth.org. All complaints
-will be reviewed and investigated and will result in a response that is deemed
-necessary and appropriate to the circumstances. The project team is obligated
-to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
+the project team at autarch@urth.org. All complaints will be reviewed and investigated and will
+result in a response that is deemed necessary and appropriate to the circumstances. The project team
+is obligated to maintain confidentiality with regard to the reporter of an incident. Further details
+of specific enforcement policies may be posted separately.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face
+temporary or permanent repercussions as determined by other members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at
 https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [homepage]: https://www.contributor-covenant.org

Changes.md

@@ -1,29 +1,119 @@
+## 1.0.0 - 2025-01-11
+
+The addition of caching is a significant behavior change for this action, so the version has been
+bumped to v1.0.0 because of this change.
+
+- This action will now configure and use `Swatinem/rust-cache` by default for you. It will include
+  the `target` parameter as part of the cache key automatically, as well as the OS version when
+  using `cargo` on Linux. Suggested by @jennydaman (Jennings Zhang). GH #23.
+- This action now validates its input and will exit early if they are not valid. GH #35.
+- When compiling for `musl` targets, this action will not try to reinstall the `musl-tools` package
+  if it's already installed.
+
+The following changes were made since the 1.0.0-beta1 release:
+
+- The cache key includes information that causes the cache to not be re-used when the system running
+  `cargo` or `cross` changes. When using `cargo` on Linux, this is the OS version, like "Ubuntu
+  22.04". When using `cross`, this is the hash of the `cross` binary itself. This is needed because
+  the Docker images that `cross` uses can change when the binary is updated. This can include
+  changing the underlying Docker image base OS, in which case it's quite likely the old cache
+  contents would be incompatible with the the new image.
+
+## 1.0.0-beta1 - 2024-12-21
+
+The addition of caching is a significant behavior change for this action, so the version has been
+bumped to v1.0.0 because of this change.
+
+- This action will now configure and use `Swatinem/rust-cache` by default for you. It will include
+  the `target` parameter as part of the cache key automatically. Suggested by @jennydaman (Jennings
+  Zhang). GH #23.
+- This action now validates its input and will exit early if they are not valid. GH #35.
+
+## 0.0.17 - 2024-11-23
+
+- Added support for running `cargo bench` or `cross bench`. Implemented by @RaulTrombin (Raul Victor
+  Trombin). GH #32.
+
+## 0.0.16 - 2024-11-17
+
+- Arguments passed in the `args` parameter are now always last when executing `cargo`. This lets you
+  pass arguments to test binaries like `-- --something`. First reported by @mateocabanal (Mateo
+  Cabanal) as GH #12 and fully fixed by @donatello (Aditya Manthramurthy) in GH #30.
+
+## 0.0.15 - 2024-09-21
+
+- The `musl` packages are only installed when not cross-compiling.
+
+## 0.0.14 - 2024-08-25
+
+- When the given `target` includes the string `musl`, this action will install the `musl-tools`
+  package. This allows crates with C or C++ code to compile properly. Fixes #20. Reported by Matteo
+  Pietro Dazzi (@ilteoood).
+
+## 0.0.13 - 2024-05-18
+
+- It's now possible to set `cross-version` to a git ref like a commit hash or `HEAD`. This will
+  install `cross` from its git repo.
+
+## 0.0.12 - 2024-02-25
+
+- Bumped the version of `actions/cache` used in this action to v4. The v3 version uses Node 16,
+  which causes warnings when run. Implemented by @hms5232. GH #13.
+
+## 0.0.11 - 2023-12-17
+
+- Use `cross` when compiling for 32-bit Linux targets. While in theory this should work without
+  `cross`, compiling `openssl` with the `vendored` feature fails when we run
+  `cargo build --target i686-unknown-linux-musl`.
+
+## 0.0.10 - 2023-12-10
+
+- Fixed handling of crates with multiple binaries. Attempting to strip binaries for such a crate
+  caused the build to fail. Reported by Tomaž Hribernik. GH #8
+- Added a new `cross-version` parameter. This can be specified to make this action use a specific
+  version of `cross`. If this is not specified, the latest version will be used.
+
+## 0.0.9 - 2023-09-10
+
+- Added a `working-directory` parameter. By default this is the current directory (`.`) but you can
+  set it to something else to compile a single crate or workspace in a subdirectory of the repo.
+  This allows you to use this action with monorepos with multiple crates. Based on GH #7 by
+  @aaronvg.
+
+## 0.0.8 - 2023-07-22
+
+- For builds that need the `cross` binary, this binary is now cached. A cache hit saves about 20
+  seconds in my tests. Suggested by @timon-schelling. GH #4.
+
+## 0.0.7 - 2023-04-21
+
+- The toolchain argument was (probably) not being respected with cross builds, though it's hard to
+  be sure since none of the output from past CI runs I've looked at it includes the toolchain
+  version in the output. But now the toolchain version is explicitly passed to all `cargo` and
+  `cross` commands.
+
 ## 0.0.6 - 2023-04-21
 
-- When the `strip` parameter was true, stripping binaries could fail if there
-  were both `target/*/debug` and `target/*/release` directories present and
-  the `debug` directory didn't have a binary. Now it will strip all binaries
-  it finds under `target`.
+- When the `strip` parameter was true, stripping binaries could fail if there were both
+  `target/*/debug` and `target/*/release` directories present and the `debug` directory didn't have
+  a binary. Now it will strip all binaries it finds under `target`.
 
 ## 0.0.5 - 2023-03-19
 
-- Fix use of `dtolnay/rust-toolchain` action to allow passing a `toolchain`
-  input.
+- Fix use of `dtolnay/rust-toolchain` action to allow passing a `toolchain` input.
 
 ## 0.0.4 - 2023-03-19
 
-- Added a new `toolchain` parameter to allow selecting a Rust toolchain other
-  than stable. This supports picking on of "stable", "beta", or "nightly".
-- Fixed binary stripping to work in more situations. Previously it depended on
-  a very specific setup plus expected to be run in the context of the matrix I
-  use for my own projects.
-- Fixed a reference to a matrix variable that should have referenced an input
-  variable.
+- Added a new `toolchain` parameter to allow selecting a Rust toolchain other than stable. This
+  supports picking on of "stable", "beta", or "nightly".
+- Fixed binary stripping to work in more situations. Previously it depended on a very specific setup
+  plus expected to be run in the context of the matrix I use for my own projects.
+- Fixed a reference to a matrix variable that should have referenced an input variable.
 
 ## 0.0.3 - 2023-03-17
 
-- This action now supports running the `build` and `test` commands, or both,
-  with a new input parameter, `command`. The default is `build`.
+- This action now supports running the `build` and `test` commands, or both, with a new input
+  parameter, `command`. The default is `build`.
 
 ## 0.0.2 - 2023-03-05
 

README.md

@@ -3,70 +3,89 @@
 This action lets you easily cross-compile Rust projects using
 [cross](https://github.com/cross-rs/cross).
 
-Here's an example from the release workflow for
-[my tool `precious`](https://github.com/houseabsolute/precious):
+Here's a simplified example from the test and release workflow for
+[my tool `ubi`](https://github.com/houseabsolute/ubi):
 
 ```yaml
 jobs:
   release:
-    name: Release - ${{ matrix.platform.release_for }}
+    name: Release - ${{ matrix.platform.os-name }}
     strategy:
       matrix:
         platform:
-          - release_for: FreeBSD-x86_64
-            os: ubuntu-20.04
+          - os-name: FreeBSD-x86_64
+            runs-on: ubuntu-20.04
             target: x86_64-unknown-freebsd
-            bin: precious
-            name: precious-FreeBSD-x86_64.tar.gz
-            command: build
+            skip_tests: true
 
-          - release_for: Windows-x86_64
-            os: windows-latest
+          - os-name: Linux-x86_64
+            runs-on: ubuntu-20.04
+            target: x86_64-unknown-linux-musl
+
+          - os-name: Linux-aarch64
+            runs-on: ubuntu-20.04
+            target: aarch64-unknown-linux-musl
+
+          - os-name: Linux-riscv64
+            runs-on: ubuntu-20.04
+            target: riscv64gc-unknown-linux-gnu
+
+          - os-name: Windows-x86_64
+            runs-on: windows-latest
             target: x86_64-pc-windows-msvc
-            bin: precious.exe
-            name: precious-Windows-x86_64.zip
-            command: both
 
-          - release_for: macOS-x86_64
-            os: macOS-latest
+          - os-name: macOS-x86_64
+            runs-on: macOS-latest
             target: x86_64-apple-darwin
-            bin: precious
-            name: precious-Darwin-x86_64.tar.gz
-            command: both
 
-            # more release targets here ...
+          # more targets here ...
 
-    runs-on: ${{ matrix.platform.os }}
+    runs-on: ${{ matrix.platform.runs-on }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build binary
-        uses: houseabsolute/actions-rust-cross@v0
+        uses: houseabsolute/actions-rust-cross@v1
         with:
           command: ${{ matrix.platform.command }}
           target: ${{ matrix.platform.target }}
           args: "--locked --release"
           strip: true
-
-    # more packaging stuff goes here ...
+      - name: Publish artifacts and release
+        uses: houseabsolute/actions-rust-release@v0
+        with:
+          executable-name: ubi
+          target: ${{ matrix.platform.target }}
 ```
 
+Note that for Linux or BSD targets, you should always set the `runs-on` key to a Linux x86-64
+architecture runner.
+
+If you _only_ want to do native ARM compilation, for example using the `ubuntu-latest-arm` runner,
+then there's no need to use this action. However, if you want to compile for _many_ platforms,
+including Linux ARM, using this action will simplify your config. This action is only tested on
+Ubuntu x86-64, Windows, and macOS runners.
+
 ## Input Parameters
 
 This action takes the following parameters:
 
-| Key            | Type                                           | Required? | Description                                                                                                                               |
-| -------------- | ---------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| `command`      | string (one of `build`, `test`, or `both`)     | no        | The command(s) to run. The default is `build`. Running the `test` command will fails with \*BSD targets, non-x86 Windows, and macOS ARM.  |
-| `target`       | string                                         | yes       | The target triple to compile for. This should be one of the targets listed by running `rustup target list`.                               |
-| `toolchain`    | string (one of `stable`, `beta`, or `nightly`) | no        | The Rust toolchain version to install. The default is `stable`                                                                            |
-| `GITHUB_TOKEN` | string                                         | no        | Defaults to the value of `${{ github.token }}`.                                                                                           |
-| `args`         | string                                         | no        | A string-separated list of arguments to be passed to `cross build`, like `--release --locked`.                                            |
-| `strip`        | boolean (`true` or `false`)                    | no        | If this is true, then the resulting binary will be stripped if possible. This is only possible for binaries which weren't cross-compiled. |
+| Key                     | Type                                                                 | Required? | Description                                                                                                                                                                                                                                                                                                                                   |
+| ----------------------- | -------------------------------------------------------------------- | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `command`               | string (one of `build`, `test`, `both` (build and test), or `bench`) | no        | The command(s) to run. The default is `build`. Running the `test` command will fail with \*BSD targets and non-x86 Windows.                                                                                                                                                                                                                   |
+| `target`                | string                                                               | yes       | The target triple to compile for. This should be one of the targets found by running `rustup target list`.                                                                                                                                                                                                                                    |
+| `working-directory`     | string                                                               | no        | The working directory in which to run the `cargo` or `cross` commands. Defaults to the current directory (`.`).                                                                                                                                                                                                                               |
+| `toolchain`             | string (one of `stable`, `beta`, or `nightly`)                       | no        | The Rust toolchain version to install. The default is `stable`.                                                                                                                                                                                                                                                                               |
+| `GITHUB_TOKEN`          | string                                                               | no        | Defaults to the value of `${{ github.token }}`.                                                                                                                                                                                                                                                                                               |
+| `args`                  | string                                                               | no        | A string-separated list of arguments to be passed to `cross build`, like `--release --locked`.                                                                                                                                                                                                                                                |
+| `strip`                 | boolean (`true` or `false`)                                          | no        | If this is true, then the resulting binaries will be stripped if possible. This is only possible for binaries which weren't cross-compiled.                                                                                                                                                                                                   |
+| `cross-version`         | string                                                               | no        | This can be used to set the version of `cross` to use. If specified, it should be a specific `cross` release tag (like `v0.2.3`) or a git ref (commit hash, `HEAD`, etc.). If this is not set then the latest released version will always be used. If this is set to a git ref then the version corresponding to that ref will be installed. |
+| `use-rust-cache`        | boolean                                                              | no        | Whether or not to use [the `Swatinem/rust-cache@v2` action](https://github.com/Swatinem/rust-cache). This defaults to true.                                                                                                                                                                                                                   |
+| `rust-cache-parameters` | string (containing JSON)                                             | no        | This must be a string containing valid JSON. The JSON should be an object where the keys are the parameters for [the `Swatinem/rust-cache@v2` action](https://github.com/Swatinem/rust-cache).                                                                                                                                                |
 
 ## How it Works
 
-Under the hood, this action will compile your binary with either `cargo` or `cross`, depending on
+Under the hood, this action will compile your binaries with either `cargo` or `cross`, depending on
 the host machine and target. For Linux builds, it will always use `cross` except for builds
 targeting an x86 architecture like `x86_64` or `i686`.
 
@@ -80,6 +99,22 @@ build `cross`.
 When compiling on Windows, it will do so in a Powershell environment, which can matter in some
 corner cases, like compiling the `openssl` crate with the `vendored` feature.
 
-Finally, it will run `strip` to strip the binary if the `strip` parameter is true. This is only
-possible for builds that are not done via `cross`. In addition, Windows builds for `aarch64` cannot
-be stripped either.
+By default, it will use
+[the `Swatinem/rust-cache@v2` action](https://github.com/Swatinem/rust-cache) to cache compiled
+dependencies for this crate. Note that per the documentation for this action, it has fairly limited
+value for crates without a `Cargo.lock` file. The `key` parameter passed to this action will always
+include the value of the `target` input. If you specify a `key` parameter in
+`rust-cache-parameters`, then the `target` input will be appended to the value you specify.
+
+When running `cargo` on a Linux system, it will also include the output of running
+`lsb_release --short --description` in the cache key. This is important for crates that link against
+system libraries. If those library versions change across OS versions (e.g. Ubuntu 20.04 to 22.04),
+then the cache will be broken for these cases.
+
+When running `cross`, the hash of the `cross` binary will be included in the cache key. This is done
+because the Docker images that `cross` uses can change when `cross` is updated. We want to make sure
+that we do not re-use the cache across changes when these images change.
+
+Finally, it will run `strip` to strip the binaries it builds if the `strip` parameter is true. This
+is only possible for builds that are not done via `cross`. In addition, Windows builds for `aarch64`
+cannot be stripped either.

action.yml

@@ -6,20 +6,23 @@ branding:
 description: |
   Cross compile your Rust projects with cross (https://github.com/cross-rs/cross).
 inputs:
-  command:
-    description: |
-      The commands to run (one of "build", "test", or "both").
-    default: build
   target:
     description: The target platform
     required: true
+  command:
+    description: |
+      The commands to run. This must be one of "build", "test", "both" (build and test), or "bench".
+    default: build
   toolchain:
     description: |
       The target toolchain to use (one of "stable", "beta", or "nightly").
     default: stable
+  working-directory:
+    description: The working directory for each step
+    default: "."
   GITHUB_TOKEN:
     description: |
-      A GitHub token, available in the secrets.GITHUB_TOKEN context variable.
+      A GitHub token, available in the secrets.GITHUB_TOKEN working-directory variable.
     default: ${{ github.token }}
   args:
     description: |
@@ -29,64 +32,165 @@ inputs:
   strip:
     description: Strip the compiled binary
     default: false
+  cross-version:
+    description: |
+      The version of cross to use. If not specified, then the latest version
+      will be used.
+  cache-cross-binary:
+    description: |
+      Cache the cross binary if one is installed. This is primarily for use in
+      tests of this action.
+    default: true
+  use-rust-cache:
+    description: |
+      Use `Swatinem/rust-cache@v2`. Defaults to true.
+    default: true
+  rust-cache-parameters:
+    description: |
+      A JSON string containing parameters to pass to `Swatinem/rust-cache@v2`. You can use the
+      `toJSON()` function in your action to make passing this easier.
+    default: "{}"
 runs:
   using: composite
   steps:
+    - name: Show inputs
+      shell: bash
+      run: |
+        echo '${{ toJSON(inputs) }}'
     - name: Add this action's path to PATH
       shell: bash
       run: echo "${{ github.action_path }}" >> $GITHUB_PATH
+    - name: Validate inputs
+      shell: bash
+      run: |
+        "${{ github.action_path }}"/validate-inputs.py "${{ github.workspace }}"
+      env:
+        INPUTS_target: ${{ inputs.target }}
+        INPUTS_command: ${{ inputs.command }}
+        INPUTS_toolchain: ${{ inputs.toolchain }}
+        INPUTS_working_directory: ${{ inputs.working-directory }}
+        INPUTS_strip: ${{ inputs.strip }}
+        INPUTS_cache_cross_binary: ${{ inputs.cache-cross-binary }}
+        INPUTS_use_rust_cache: ${{ inputs.use-rust-cache }}
+        INPUTS_rust_cache_parameters: ${{ inputs.rust-cache-parameters }}
     - name: Determine whether we need to cross-compile
       id: determine-cross-compile
       shell: bash
       run: set-cross-compile.sh ${{ inputs.target }}
-    - name: Install toolchain if not cross-compiling
+    - name: Install toolchain
       uses: dtolnay/rust-toolchain@master
       with:
         targets: ${{ inputs.target }}
         toolchain: ${{ inputs.toolchain }}
-      if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'false' }}
+    - name: Determine cross version
+      id: determine-cross-version
+      shell: bash
+      run: determine-cross-version.sh "${{ inputs.cross-version }}"
+      env:
+        GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
+      if: steps.determine-cross-compile.outputs.needs-cross == 'true'
+    # We need to access this in both this YAML config and shell scripts. It
+    # doesn't seem like using ${{ env.RUNNER_TEMP }} works in the YAML config.
+    - name: Set directory for installing cross
+      id: set-cross-dir
+      shell: bash
+      run: set-cross-dir.sh
+      if: steps.determine-cross-compile.outputs.needs-cross == 'true'
+    - name: Cache cross
+      id: cache-cross
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.set-cross-dir.outputs.cross-dir }}/cross
+        key: ${{ runner.os }}-${{ steps.determine-cross-version.outputs.cross-version }}
+      if: steps.determine-cross-compile.outputs.needs-cross == 'true' && inputs.cache-cross-binary == 'true'
     - name: Install cross if cross-compiling (*nix)
       shell: bash
-      run: install-cross-nix.sh
-      if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' && runner.os != 'Windows' }}
-      env:
-        GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
-    - name: Install cross if cross-compiling (Windows)
-      shell: powershell
-      run: install-cross-windows.ps1
-      if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' && runner.os == 'Windows' }}
+      run: install-cross-nix.sh ${{ steps.set-cross-dir.outputs.cross-dir }} ${{ steps.determine-cross-version.outputs.cross-version }}
+      if: steps.determine-cross-compile.outputs.needs-cross == 'true' && steps.cache-cross.outputs.cache-hit != 'true'
       env:
         GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
+    - name: Install musl-tools on Linux if target includes "musl"
+      shell: bash
+      run: |
+        if dpkg -l musl-tools | grep -q "^ii\s*musl-tools"; then
+            exit 0
+        fi
+        sudo apt-get update --yes && \
+            sudo apt-get install --yes musl-tools
+      if: steps.determine-cross-compile.outputs.needs-cross != 'true' && contains(inputs.target, 'musl')
     - name: Set build command
       id: set-build-command
       shell: bash
-      run: set-build-command.sh
-    - name: Run tests (*nix)
+      run: set-build-command.sh ${{ steps.set-cross-dir.outputs.cross-dir }}
+    - name: Determine which cargo commands to run
+      id: determine-cargo-commands
+      shell: bash
+      run: determine-cargo-commands.sh ${{ inputs.command }}
+    - name: Parse `rust-cache-parameters` and set inputs for `Swatinem/rust-cache@v2`
+      id: parse-rust-cache-parameters
       shell: bash
       run: |
-        ${{ steps.set-build-command.outputs.build-command }} test ${{ inputs.args }} --target ${{ inputs.target }}
-      if: ${{ inputs.command != 'build' && runner.os != 'Windows' }}
+        set -e
+        set -x
+        set -o pipefail
+        OS_VERSION=""
+        if [ -x /usr/bin/lsb_release ]; then
+            # This will be something like "Ubuntu 22.04.5 LTS"
+            OS_VERSION="$( lsb_release --short --description )"
+        fi
+        # This will get the inputs JSON from the `RUST_CACHE_PARAMETERS` env var. This avoids
+        # any string interpolation issues, since the inputs will contain quotes.
+        parse-and-set-rust-cache-parameters.py "${{ inputs.target }}" "${{ steps.set-build-command.outputs.build-command }}" "$OS_VERSION"
+      env:
+        RUST_CACHE_PARAMETERS: ${{ inputs.rust-cache-parameters }}
+      if: inputs.use-rust-cache == 'true'
+    - name: Cache cargo & target directories
+      uses: Swatinem/rust-cache@v2
+      with: ${{ steps.parse-rust-cache-parameters.outputs }}
+      if: inputs.use-rust-cache == 'true'
+    - name: Run tests (*nix)
+      working-directory: ${{ inputs.working-directory }}
+      shell: bash
+      run: |
+        ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test --target ${{ inputs.target }} ${{ inputs.args }}
+      if: steps.determine-cargo-commands.outputs.test == 'true' && runner.os != 'Windows'
     # We want to run in Powershell on Windows to make sure we compile in a
     # native Windows environment. Some things won't compile properly under
     # msys, notably OpenSSL, which is compiled locally when using the
     # `openssl` crate with the `vendored` feature.
     - name: Run tests (Windows)
+      working-directory: ${{ inputs.working-directory }}
       shell: powershell
       run: |
-        & ${{ steps.set-build-command.outputs.build-command }} test ${{ inputs.args }} --target ${{ inputs.target }}
-      if: ${{ inputs.command != 'build' && runner.os == 'Windows' }}
-    - name: Build binary (*nix)
+        & ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test --target ${{ inputs.target }} ${{ inputs.args }}
+      if: steps.determine-cargo-commands.outputs.test == 'true' && runner.os == 'Windows'
+    - name: Run benchmarks (*nix)
+      working-directory: ${{ inputs.working-directory }}
       shell: bash
       run: |
-        ${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }}
-      if: ${{ inputs.command != 'test' && runner.os != 'Windows' }}
-    - name: Build binary (Windows)
+        ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} bench --target ${{ inputs.target }} ${{ inputs.args }}
+      if: steps.determine-cargo-commands.outputs.bench == 'true' && runner.os != 'Windows'
+    - name: Run benchmarks (Windows)
+      working-directory: ${{ inputs.working-directory }}
       shell: powershell
       run: |
-        & ${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }}
-      if: ${{ inputs.command != 'test' && runner.os == 'Windows' }}
+        & ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} bench --target ${{ inputs.target }} ${{ inputs.args }}
+      if: steps.determine-cargo-commands.outputs.bench == 'true' && runner.os == 'Windows'
+    - name: Build binary (*nix)
+      working-directory: ${{ inputs.working-directory }}
+      shell: bash
+      run: |
+        ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
+      if: steps.determine-cargo-commands.outputs.build == 'true' && runner.os != 'Windows'
+    - name: Build binary (Windows)
+      working-directory: ${{ inputs.working-directory }}
+      shell: powershell
+      run: |
+        & ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
+      if: steps.determine-cargo-commands.outputs.build == 'true' && runner.os == 'Windows'
     - name: Strip binary
+      working-directory: ${{ inputs.working-directory }}
       shell: bash
       run: strip-binary.sh ${{ inputs.target }}
       # strip doesn't work with cross-arch binaries on Linux or Windows.
-      if: ${{ inputs.command != 'test' && inputs.strip == 'true' && steps.determine-cross-compile.outputs.needs-cross == 'false' && inputs.target != 'aarch64-pc-windows-msvc' }}
+      if: inputs.command != 'test' && inputs.strip == 'true' && steps.determine-cross-compile.outputs.needs-cross == 'false' && inputs.target != 'aarch64-pc-windows-msvc'

determine-cargo-commands.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -x
+set -o pipefail
+
+COMMAND="$1"
+if [ "$COMMAND" == 'both' ]; then
+    echo "build=true" >>"$GITHUB_OUTPUT"
+    echo "test=true" >>"$GITHUB_OUTPUT"
+else
+    echo "$COMMAND=true" >>"$GITHUB_OUTPUT"
+fi

determine-cross-version.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+set -x
+set -o pipefail
+
+VERSION=$1
+
+if [ -z "$VERSION" ]; then
+    JSON=$(curl \
+        --request GET \
+        --header "Authorization: Bearer $GITHUB_TOKEN" \
+        https://api.github.com/repos/cross-rs/cross/releases/latest)
+    VERSION=$(echo "$JSON" | jq -r ".tag_name")
+fi
+
+echo "cross-version=$VERSION" >>"$GITHUB_OUTPUT"

dev/bin/install-dev-tools.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-function run () {
-    echo $1
-    eval $1
-}
-
-function install_tools () {
-    curl --silent --location \
-         https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.sh |
-        sh
-    run "rustup component add clippy"
-    run "ubi --project houseabsolute/precious --in ~/bin"
-    run "npm install prettier"
-}
-
-if [ "$1" == "-v" ]; then
-    set -x
-fi
-
-mkdir -p $HOME/bin
-
-set +e
-echo ":$PATH:" | grep --extended-regexp ":$HOME/bin:" >& /dev/null
-if [ "$?" -eq "0" ]; then
-    path_has_home_bin=1
-fi
-set -e
-
-if [ -z "$path_has_home_bin" ]; then
-    PATH=$HOME/bin:$PATH
-fi
-
-install_tools
-
-echo "Tools were installed into $HOME/bin."
-if [ -z "$path_has_home_bin" ]; then
-     echo "You should add $HOME/bin to your PATH."
-fi
-
-exit 0

git/hooks/pre-commit.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+declare -i status
 status=0
 
 PRECIOUS=$(which precious)
@@ -7,8 +8,7 @@ if [[ -z $PRECIOUS ]]; then
     PRECIOUS=./bin/precious
 fi
 
-"$PRECIOUS" lint -s
-if (( $? != 0 )); then
+if ! "$PRECIOUS" lint -s; then
     status+=1
 fi
 

git/setup.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+# This code was mostly written by Claude.ai.
+
+import os
+import sys
+
+
+def main() -> None:
+    """
+    Main entry point to create a pre-commit hook symlink.
+    """
+    symlink_hook("pre-commit")
+
+
+def symlink_hook(hook: str) -> None:
+    """
+    Create a symlink for a Git hook if it doesn't already exist.
+
+    Args:
+        hook: Name of the Git hook (e.g., 'pre-commit')
+    """
+    # Path to the hook in .git/hooks
+    dot_hook_path = os.path.join(".git", "hooks", hook)
+
+    # Path to the actual hook script
+    file_hook_path = os.path.join("git", "hooks", f"{hook}.sh")
+
+    # Relative symlink path
+    link_path = os.path.join("..", "..", file_hook_path)
+
+    # Check if the hook already exists
+    if os.path.exists(dot_hook_path):
+        # If it's already a symlink, check if it points to the correct location
+        if os.path.islink(dot_hook_path):
+            # If the existing symlink is correct, do nothing
+            if os.readlink(dot_hook_path) == link_path:
+                return
+
+        # If a hook exists and is not the expected symlink, warn and exit
+        print(f"You already have a hook at {dot_hook_path}!", file=sys.stderr)
+        return
+
+    # Create the symlink
+    try:
+        os.symlink(link_path, dot_hook_path)
+    except OSError as e:
+        print(f"Error creating symlink: {e}", file=sys.stderr)
+
+
+if __name__ == "__main__":
+    main()

install-cross-nix.sh

@@ -1,9 +1,30 @@
+#!/bin/bash
+
 set -e
 set -x
+set -o pipefail
+
+CROSS_DIR="$1"
+VERSION="$2"
+
+cd "$CROSS_DIR"
+
+if [[ -n $VERSION ]] && ! [[ $VERSION =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    cargo install cross --git https://github.com/cross-rs/cross --rev "$VERSION" --force
+    mv "$HOME/.cargo/bin/cross" .
+    CROSS_NO_WARNINGS=0 ./cross --version
+    exit 0
+fi
+
+VERSION_ARGS=""
+if [ -n "$VERSION" ]; then
+    VERSION_ARGS="--tag $VERSION"
+fi
 
-cd "$RUNNER_TEMP"
 export TARGET=.
 curl --silent --location \
-     https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.sh |
+    https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.sh |
     sh
-./ubi --project cross-rs/cross --matching musl --in .
+# shellcheck disable=SC2086
+./ubi --project cross-rs/cross --matching musl --in . $VERSION_ARGS
+CROSS_NO_WARNINGS=0 ./cross --version

install-cross-windows.ps1

@@ -1,4 +0,0 @@
-cd $Env:RUNNER_TEMP
-Invoke-WebRequest -URI 'https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.ps1' -UseBasicParsing | Invoke-Expression
-.\ubi --project cross-rs/cross --in .
-

mise.toml

@@ -0,0 +1,10 @@
+[tools]
+node = "22.11.0"
+"npm:prettier" = "3.4.1"
+ruff = "0.8.3"
+shellcheck = "v0.10.0"
+shfmt = "v3.10.0"
+taplo = "0.9.3"
+typos = "1.28.1"
+"ubi:houseabsolute/omegasort" = "v0.1.3"
+"ubi:houseabsolute/precious" = "v0.7.3"

parse-and-set-rust-cache-parameters.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import sys
+import hashlib
+
+
+def main():
+    target = sys.argv[1]
+    build_command = sys.argv[2]
+
+    os_version = sys.argv[3]
+
+    parameters = json.loads(os.environ["RUST_CACHE_PARAMETERS"])
+    if "key" not in parameters:
+        parameters["key"] = target
+    else:
+        parameters["key"] += "-{}".format(target)
+
+    if build_command == "cargo":
+        # If we're running cargo, we need to add the OS version to the cache. Otherwise things that link
+        # against system packages, like openssl, can break when we use the same cache across different
+        # versions of the runner OS. For example, when going from Ubuntu 20.04 to 22.04, we move from
+        # OpenSSL 1.1.x to 3.x.
+        parameters["key"] += "-{}".format(os_version)
+    else:
+        # Otherwise we want to include the `cross` binary's hash. The Docker images that `cross`
+        # uses can change when the binary is updated. This protects us from using the same cache
+        # inside containers that have changed.
+        parameters["key"] += "-cross-binary-hash-{}".format(
+            get_file_hash(build_command)
+        )
+
+    file = os.environ["GITHUB_OUTPUT"]
+    with open(file, "w") as f:
+        for key, value in parameters.items():
+            f.write(f"{key}={value}")
+
+
+def get_file_hash(build_command):
+    with open(build_command, "rb") as f:
+        file_hash = hashlib.sha256()
+        while chunk := f.read(65536):
+            file_hash.update(chunk)
+            return file_hash.hexdigest()
+
+
+main()

perltidyrc

@@ -0,0 +1,22 @@
+-l=78
+-i=4
+-ci=4
+-se
+-b
+-bar
+-boc
+-vt=0
+-vtc=0
+-cti=0
+-pt=1
+-bt=1
+-sbt=1
+-bbt=1
+-nolq
+-npro
+-nsfs
+--blank-lines-before-packages=0
+--opening-hash-brace-right
+--no-outdent-long-comments
+--iterations=2
+-wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= &&= -= /= |= >>= ||= .= %= ^= x="

precious.toml

@@ -1,11 +1,106 @@
 exclude = [
   "target",
+  "tests/lib/**/*",
 ]
 
-[commands.prettier]
+[commands.clippy]
+type = "lint"
+include = "**/*.rs"
+invoke = "once"
+path-args = "none"
+working-dir.chdir-to = "run-tests"
+cmd = [
+    "cargo",
+    "clippy",
+    "--color",
+    "always",
+    "--locked",
+    "--all-targets",
+    "--all-features",
+    "--",
+    "-D",
+    "clippy::pedantic",
+]
+ok_exit_codes = 0
+lint_failure_exit_codes = 101
+expect_stderr = true
+labels = ["default"]
+
+[commands."clippy --fix"]
+type = "tidy"
+include = "**/*.rs"
+invoke = "once"
+path-args = "none"
+working-dir.chdir-to = "run-tests"
+cmd = [
+    "cargo",
+    "clippy",
+    "--fix",
+    "--allow-dirty",
+    "--locked",
+    "--all-targets",
+    "--all-features",
+    "--",
+    "-D",
+    "clippy::pedantic",
+]
+ok_exit_codes = 0
+lint_failure_exit_codes = 101
+expect_stderr = true
+labels = ["default"]
+
+[commands.rustfmt]
+type = "both"
+include = "**/*.rs"
+working-dir.chdir-to = "run-tests"
+cmd = ["rustfmt", "--edition", "2021"]
+lint_flags = "--check"
+ok_exit_codes = [0]
+lint_failure_exit_codes = [1]
+labels = ["default", "fast-tidy"]
+
+[commands."ruff for linting"]
+type = "both"
+include = [ "**/*.py" ]
+cmd = "ruff"
+lint_flags = [ "check" ]
+tidy_flags = [ "check", "--fix" ]
+ok_exit_codes = 0
+lint_failure_exit_codes = 1
+
+[commands."ruff for tidying"]
+type = "both"
+include = [ "**/*.py" ]
+cmd = "ruff"
+lint_flags = [ "format", "--check" ]
+tidy_flags = [ "format" ]
+ok_exit_codes = 0
+lint_failure_exit_codes = 1
+
+[commands.typos]
+type = "both"
+include = "**/*"
+exclude = "**/*.tar.gz"
+invoke = "once"
+cmd = "typos"
+tidy_flags = "--write-changes"
+ok-exit-codes = 0
+lint-failure-exit-codes = 2
+
+[commands.prettier-md]
 type    = "both"
-include = [ "**/*.md", "**/*.yml" ]
-cmd     = [ "./node_modules/.bin/prettier", "--no-config" ]
+include = [ "**/*.md" ]
+cmd     = [ "prettier", "--no-config", "--print-width", "100", "--prose-wrap", "always" ]
+lint_flags = "--check"
+tidy_flags = "--write"
+ok_exit_codes = 0
+lint_failure_exit_codes = 1
+ignore_stderr = [ "Code style issues" ]
+
+[commands.prettier-yml]
+type    = "both"
+include = [ "**/*.yml" ]
+cmd     = [ "prettier", "--no-config" ]
 lint_flags = "--check"
 tidy_flags = "--write"
 ok_exit_codes = 0
@@ -24,3 +119,19 @@ ignore_stderr = [
     "The .+ file is not sorted",
     "The .+ file is not unique",
 ]
+
+[commands.shellcheck]
+type = "lint"
+include = "**/*.sh"
+cmd = "shellcheck"
+ok_exit_codes = 0
+lint_failure_exit_codes = 1
+
+[commands.shfmt]
+type = "both"
+include = "**/*.sh"
+cmd = ["shfmt", "--simplify", "--indent", "4"]
+lint_flags = "--diff"
+tidy_flags = "--write"
+ok_exit_codes = 0
+lint_failure_exit_codes = 1

run-tests/Cargo.lock

@@ -0,0 +1,314 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "is_executable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a1b5bad6f9072935961dfbf1cced2f3d129963d091b6f69f007fe04e758ae2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "run-tests"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "is_executable",
+ "regex",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

run-tests/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "run-tests"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+clap = { version = "4.5.23", features = ["derive"] }
+is_executable = "1.0.4"
+regex = "1.11.1"

run-tests/src/main.rs

@@ -0,0 +1,155 @@
+// Mostly written by Claude.ai.
+
+use clap::Parser;
+use is_executable::is_executable;
+use regex::Regex;
+use std::{
+    env,
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+struct Args {
+    #[arg(long)]
+    checkout_root: String,
+    #[arg(long)]
+    target: String,
+    #[arg(long)]
+    expect_file_re: Option<String>,
+    #[arg(long)]
+    expect_cross: bool,
+    #[arg(long)]
+    expect_cross_version: Option<String>,
+    #[arg(long)]
+    expect_stripped: bool,
+}
+
+fn main() {
+    let args = Args::parse();
+
+    let runner_temp = env::var("RUNNER_TEMP").expect("RUNNER_TEMP is not set");
+    let runner_temp_path = PathBuf::from(runner_temp);
+
+    check_cross(
+        &runner_temp_path,
+        args.expect_cross,
+        args.expect_cross_version.as_deref(),
+    );
+
+    let checkout_root_path = PathBuf::from(args.checkout_root);
+    let bin_paths = vec![
+        checkout_root_path
+            .join("target")
+            .join(&args.target)
+            .join("debug")
+            .join("bin1"),
+        checkout_root_path
+            .join("target")
+            .join(&args.target)
+            .join("debug")
+            .join("bin2"),
+        checkout_root_path
+            .join("subcrate")
+            .join("target")
+            .join(&args.target)
+            .join("debug")
+            .join("subcrate"),
+    ];
+
+    for mut bin_path in bin_paths {
+        if cfg!(windows) {
+            bin_path.set_extension("exe");
+        }
+        check_binary(
+            &bin_path,
+            args.expect_file_re.as_deref(),
+            args.expect_stripped,
+        );
+    }
+}
+
+fn check_cross(bin_dir: &Path, expect_cross: bool, expect_cross_version: Option<&str>) {
+    let cross_path = bin_dir.join("cross");
+
+    if expect_cross {
+        assert!(cross_path.is_file(), "`cross` exists");
+
+        if let Some(expected_version) = expect_cross_version {
+            let output = Command::new(&cross_path)
+                .arg("--version")
+                .output()
+                .expect("Failed to execute `cross` command");
+            let version = String::from_utf8(output.stdout)
+                .expect("`cross --version` stdout was not valid UTF-8");
+            assert!(
+                version.contains(expected_version),
+                "`cross` version matches expected version"
+            );
+        }
+    } else {
+        assert!(!cross_path.exists(), "`cross` was not downloaded");
+    }
+}
+
+fn check_binary(bin_path: &PathBuf, expect_file_re: Option<&str>, expect_stripped: bool) {
+    assert!(bin_path.exists(), "Binary at {} exists", bin_path.display());
+    assert!(
+        bin_path.is_file(),
+        "Binary at {} is a file",
+        bin_path.display()
+    );
+
+    assert!(
+        is_executable(bin_path),
+        "Binary at {} is executable",
+        bin_path.display()
+    );
+
+    let output = Command::new("file")
+        .arg("--brief")
+        .arg(bin_path)
+        .output()
+        .expect("Failed to execute `file` command");
+    let file_output = String::from_utf8_lossy(&output.stdout);
+
+    if let Some(file_re) = expect_file_re {
+        let re = Regex::new(file_re).expect("Invalid regex");
+        assert!(
+            re.is_match(&file_output),
+            "`file` output for {} matches expected output",
+            bin_path.display(),
+        );
+    }
+
+    // `file` on macOS doesn't report if the binary is stripped.
+    if cfg!(target_os = "macos") {
+        return;
+    }
+
+    if expect_stripped {
+        assert!(
+            !file_output.contains("not stripped"),
+            "`file` does not report {} as not stripped",
+            bin_path.display(),
+        );
+        assert!(
+            file_output.contains("stripped"),
+            "`file` reports {} as stripped",
+            bin_path.display(),
+        );
+    } else if cfg!(windows) {
+        assert!(
+            !file_output.contains("stripped"),
+            "`file` does not report {} as stripped",
+            bin_path.display(),
+        );
+    } else {
+        assert!(
+            file_output.contains("not stripped"),
+            "`file` reports {} as not stripped",
+            bin_path.display(),
+        );
+    }
+}

set-build-command.sh

@@ -1,8 +1,12 @@
+#!/bin/bash
+
 set -e
 set -x
+set -o pipefail
 
-if [ -f "$RUNNER_TEMP/cross" ]; then
-    echo "build-command=$RUNNER_TEMP/cross" >> $GITHUB_OUTPUT
+CROSS_DIR="$1"
+if [ -f "$CROSS_DIR/cross" ]; then
+    echo "build-command=$CROSS_DIR/cross" >>"$GITHUB_OUTPUT"
 else
-    echo "build-command=cargo" >> $GITHUB_OUTPUT
+    echo "build-command=cargo" >>"$GITHUB_OUTPUT"
 fi

set-cross-compile.sh

@@ -1,18 +1,25 @@
+#!/bin/bash
+
 set -e
 set -x
+set -o pipefail
 
 TARGET="$1"
 
 # On macOS and Windows, we can cross-compile to all possible targets without
 # using cross.
 if uname -a | grep --quiet --extended-regexp -i "darwin|msys|windows"; then
-    echo "needs-cross=false" >> $GITHUB_OUTPUT
+    echo "needs-cross=false" >>"$GITHUB_OUTPUT"
     exit 0
 fi
 
-if echo "$TARGET" | grep --quiet --extended-regexp -i '(x86_64|586|686).+linux-(gnu|musl)'; then
-    echo "needs-cross=false" >> $GITHUB_OUTPUT
+# On Linux, we should be able to cross-compile to i586 and i686, but in
+# practice this fails with some crates, notably openssl with the "vendored"
+# feature. This feature makes it compile openssl itself, which fails without
+# cross.
+if echo "$TARGET" | grep --quiet --extended-regexp -i 'x86_64.+linux-(gnu|musl)'; then
+    echo "needs-cross=false" >>"$GITHUB_OUTPUT"
     exit 0
 fi
 
-echo "needs-cross=true" >> $GITHUB_OUTPUT
+echo "needs-cross=true" >>"$GITHUB_OUTPUT"

set-cross-dir.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+set -x
+set -o pipefail
+
+echo "cross-dir=$RUNNER_TEMP" >>"$GITHUB_OUTPUT"

strip-binary.sh

@@ -1,21 +1,33 @@
+#!/bin/bash
+
 set -e
 set -x
+set -o pipefail
 
 TARGET=$1
-stripped=""
+did_strip=""
 
-strip_binary () {
-    if [[ $( uname -s ) =~ "Darwin" ]]; then
-        EXE=$( find "$1" -maxdepth 1 -type f -perm +111 )
+strip_binary() {
+    if [[ $(uname -s) =~ "Darwin" ]]; then
+        stripped=$(
+            find "$1" -maxdepth 1 -type f -perm +111 | while read -r exe; do
+                strip "$exe"
+                echo "stripped $exe"
+            done
+        )
     else
-        EXE=$( find "$1" -maxdepth 1 -type f -executable )
+        stripped=$(
+            find "$1" -maxdepth 1 -type f -executable | while read -r exe; do
+                strip "$exe"
+                echo "stripped $exe"
+            done
+        )
     fi
 
-    if [ -z "$EXE" ]; then
-        echo "Could not find a binary to strip in $1"
+    if [ -z "$stripped" ]; then
+        echo "Could not find any binaries to strip in $1"
     else
-        strip "$EXE"
-        stripped="$EXE"
+        did_strip="true"
     fi
 }
 
@@ -27,7 +39,7 @@ for type in debug release; do
     fi
 done
 
-if [ -z "$stripped" ]; then
+if [ -z "$did_strip" ]; then
     echo "No binaries were stripped"
     exit 1
 fi

test-project/Cargo.toml

@@ -3,4 +3,25 @@ name = "test-project"
 version = "0.1.0"
 edition = "2021"
 
-[dependencies]
+# For testing it would be nice to create a binary with spaces in the name, but
+# right now the `name` value must be a valid crate name, and there's no
+# separate setting for the compiled executable's name. See
+# https://github.com/rust-lang/cargo/issues/9778.
+[[bin]]
+name = "bin1"
+path = "src/bin1.rs"
+
+[[bin]]
+name = "bin2"
+path = "src/bin2.rs"
+
+# workaround for https://github.com/cross-rs/cross/issues/1345
+[package.metadata.cross.target.x86_64-unknown-netbsd]
+pre-build = [
+    "mkdir -p /tmp/netbsd",
+    "curl https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/amd64/binary/sets/base.tar.xz -O",
+    "tar -C /tmp/netbsd -xJf base.tar.xz",
+    "cp /tmp/netbsd/usr/lib/libexecinfo.so /usr/local/x86_64-unknown-netbsd/lib",
+    "rm base.tar.xz",
+    "rm -rf /tmp/netbsd",
+]

test-project/bench/Cargo.lock

@@ -0,0 +1,651 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bench"
+version = "0.1.0"
+dependencies = [
+ "criterion",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "bitflags",
+ "clap_lex",
+ "indexmap",
+ "textwrap",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "criterion"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+dependencies = [
+ "anes",
+ "atty",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2"
+
+[[package]]
+name = "js-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.164"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "oorandom"
+version = "11.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+
+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "web-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

test-project/bench/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "bench"
+version = "0.1.0"
+edition = "2021"
+
+[dev-dependencies]
+criterion = "0.4"
+
+[[bench]]
+name = "benchmark"
+harness = false

test-project/bench/benches/benchmark.rs

@@ -0,0 +1,16 @@
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
+fn fibonacci(n: u64) -> u64 {
+    match n {
+        0 => 1,
+        1 => 1,
+        n => fibonacci(n - 1) + fibonacci(n - 2),
+    }
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    c.bench_function("fib 20", |b| b.iter(|| fibonacci(black_box(20))));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

test-project/bench/lib.rs

@@ -0,0 +1 @@
+

test-project/src/bin2.rs

@@ -0,0 +1,17 @@
+fn main() {
+    println!("Hello, world!");
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_something() {
+        assert_eq!(1, 1);
+    }
+
+    #[test]
+    #[ignore]
+    fn test_something_ignored() {
+        assert_eq!(2, 2);
+    }
+}

test-project/subcrate/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "subcrate"
+version = "0.1.0"

test-project/subcrate/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "subcrate"
+version = "0.1.0"
+edition = "2021"
+
+# workaround for https://github.com/cross-rs/cross/issues/1345
+[package.metadata.cross.target.x86_64-unknown-netbsd]
+pre-build = [
+    "mkdir -p /tmp/netbsd",
+    "curl https://cdn.netbsd.org/pub/NetBSD/NetBSD-9.2/amd64/binary/sets/base.tar.xz -O",
+    "tar -C /tmp/netbsd -xJf base.tar.xz",
+    "cp /tmp/netbsd/usr/lib/libexecinfo.so /usr/local/x86_64-unknown-netbsd/lib",
+    "rm base.tar.xz",
+    "rm -rf /tmp/netbsd",
+]

test-project/subcrate/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world (subcrate)!");
+}

tests/check-binary.sh

@@ -1,49 +0,0 @@
-set -e
-set -x
-
-TARGET=$1
-EXPECT_CROSS=$2
-EXPECT_FILE_RE=$3
-EXPECT_STRIPPED=$4
-
-if [ "$EXPECT_CROSS" == "true" ]; then
-    if [ ! -f "$RUNNER_TEMP/cross" ]; then
-        echo "Could not find cross in path: $PATH"
-        exit 1
-    fi
-else
-    if [ -f "$RUNNER_TEMP/cross" ]; then
-        echo "Found cross in path: $PATH"
-        exit 1
-    fi
-fi
-
-FILE=$(file --brief ./target/$TARGET/debug/test-project)
-if [[ "$FILE" =~ $EXPECT_FILE_RE ]]; then
-    echo "file output matches $EXPECT_FILE_RE"
-else
-    echo "file output does not match $EXPECT_FILE_RE"
-    exit 2
-fi
-
-if [[ $( uname -s ) =~ "Darwin" ]]; then
-    # File on macOS doesn't report whether the binary is stripped or not.
-    exit 0
-fi
-
-if [[ "$FILE" =~ "not stripped" ]]; then
-    echo "binary was not stripped"
-    GOT_STRIPPED="false"
-elif [[ "$FILE" =~ "stripped" ]]; then
-    echo "binary was stripped"
-    GOT_STRIPPED="true"
-else
-    # On Windows the aarch64 binary's file info doesn't include the word
-    # "stripped" at all.
-    echo "binary was not stripped"
-    GOT_STRIPPED="false"
-fi
-
-if [ "$EXPECT_STRIPPED" != "$GOT_STRIPPED" ]; then
-    exit 3
-fi

validate-inputs.py

@@ -0,0 +1,261 @@
+#!/usr/bin/env python3
+
+# Written by Claude.ai
+
+import os
+import json
+from pathlib import Path
+from typing import Dict, List, Union
+import tempfile
+import unittest
+
+
+class InputValidator:
+    """Validate inputs for a GitHub Action."""
+
+    def __init__(self, repo_root: Union[str, Path]):
+        """
+        Create a new InputValidator by collecting environment variables.
+
+        Args:
+            repo_root: Path to the repository root
+        """
+        self.repo_root = Path(repo_root)
+        self.inputs: Dict[str, str] = {
+            key.replace("INPUTS_", "").lower(): value
+            for key, value in os.environ.items()
+            if key.startswith("INPUTS_")
+        }
+
+    def validate(self) -> List[str]:
+        """
+        Validate all inputs according to specifications.
+
+        Returns:
+            List of validation errors. Empty list means all inputs are valid.
+        """
+        validation_errors: List[str] = []
+
+        # Check for required 'target' parameter
+        if "target" not in self.inputs:
+            validation_errors.append("'target' is a required parameter")
+
+        # Validate command if present
+        if "command" in self.inputs:
+            valid_commands = {"build", "test", "both", "bench"}
+            if self.inputs["command"] not in valid_commands:
+                validation_errors.append(
+                    f"Invalid 'command'. Must be one of {sorted(valid_commands)}"
+                )
+
+        # Validate toolchain if present
+        if "toolchain" in self.inputs:
+            valid_toolchains = {"stable", "beta", "nightly"}
+            if self.inputs["toolchain"] not in valid_toolchains:
+                validation_errors.append(
+                    f"Invalid 'toolchain'. Must be one of {sorted(valid_toolchains)}"
+                )
+
+        # Validate working directory if present
+        if "working_directory" in self.inputs:
+            path = Path(self.inputs["working_directory"])
+            if not path.is_absolute():
+                path = self.repo_root / path
+
+            if not path.exists():
+                validation_errors.append(
+                    f"'working-directory' does not exist: {self.inputs['working_directory']}"
+                )
+            elif not path.is_dir():
+                validation_errors.append(
+                    f"'working-directory' is not a directory: {self.inputs['working_directory']}"
+                )
+
+        # Validate boolean flags
+        boolean_flags = {"cache_cross_binary", "strip", "use_rust_cache"}
+        for flag in boolean_flags:
+            if flag in self.inputs and self.inputs[flag] not in {"true", "false"}:
+                validation_errors.append(f"'{flag}' must be either 'true' or 'false'")
+
+        # Validate rust-cache-parameters JSON if present
+        if "rust_cache_parameters" in self.inputs:
+            try:
+                json.loads(self.inputs["rust_cache_parameters"])
+            except json.JSONDecodeError:
+                validation_errors.append("'rust-cache-parameters' must be valid JSON")
+
+        return validation_errors
+
+
+def main() -> None:
+    """Main function for running the validator."""
+    import sys
+
+    validator = InputValidator(sys.argv[1])
+    errors = validator.validate()
+
+    if not errors:
+        print("All inputs are valid.")
+        sys.exit(0)
+    else:
+        for error in errors:
+            print(error, file=sys.stderr)
+        sys.exit(1)
+
+
+class TestInputValidator(unittest.TestCase):
+    """Unit tests for the InputValidator."""
+
+    def setUp(self) -> None:
+        """Set up test environment."""
+        # Clear existing INPUTS_ environment variables
+        for key in list(os.environ.keys()):
+            if key.startswith("INPUTS_"):
+                del os.environ[key]
+
+    def setup_env(self, inputs: Dict[str, str]) -> None:
+        """Helper function to set up environment variables for testing."""
+        for key, value in inputs.items():
+            env_key = f"INPUTS_{key.upper().replace('-', '_')}"
+            os.environ[env_key] = value
+
+    def test_get_inputs_from_env(self) -> None:
+        """Test getting inputs from environment variables."""
+        inputs = {
+            "target": "x86_64-unknown-linux-gnu",
+            "command": "build",
+            "toolchain": "stable",
+            "use-rust-cache": "true",
+        }
+        self.setup_env(inputs)
+
+        validator = InputValidator("/root")
+        for key, value in validator.inputs.items():
+            self.assertEqual(value, inputs[key.replace("_", "-")])
+
+    def test_validate_missing_target(self) -> None:
+        """Test validation with missing target."""
+        self.setup_env({})
+        validator = InputValidator("/root")
+        errors = validator.validate()
+        self.assertTrue(errors)
+
+    def test_validate_valid_command(self) -> None:
+        """Test validation of valid commands."""
+        valid_commands = ["build", "test", "both", "bench"]
+
+        for command in valid_commands:
+            self.setup_env({"target": "x86_64-unknown-linux-gnu", "command": command})
+            validator = InputValidator("/root")
+            errors = validator.validate()
+            self.assertFalse(errors, f"Command '{command}' should be valid")
+
+    def test_validate_invalid_command(self) -> None:
+        """Test validation of invalid command."""
+        self.setup_env({"target": "x86_64-unknown-linux-gnu", "command": "invalid"})
+        validator = InputValidator("/root")
+        errors = validator.validate()
+        self.assertTrue(errors)
+
+    def test_validate_valid_toolchain(self) -> None:
+        """Test validation of valid toolchains."""
+        valid_toolchains = ["stable", "beta", "nightly"]
+
+        for toolchain in valid_toolchains:
+            self.setup_env(
+                {"target": "x86_64-unknown-linux-gnu", "toolchain": toolchain}
+            )
+            validator = InputValidator("/root")
+            errors = validator.validate()
+            self.assertFalse(errors, f"Toolchain '{toolchain}' should be valid")
+
+    def test_validate_invalid_toolchain(self) -> None:
+        """Test validation of invalid toolchain."""
+        self.setup_env({"target": "x86_64-unknown-linux-gnu", "toolchain": "unknown"})
+        validator = InputValidator("/root")
+        errors = validator.validate()
+        self.assertTrue(errors)
+
+    def test_validate_working_directory(self) -> None:
+        """Test validation of working directory."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Test with valid directory
+            self.setup_env(
+                {"target": "x86_64-unknown-linux-gnu", "working-directory": temp_dir}
+            )
+            validator = InputValidator("/root")
+            errors = validator.validate()
+            self.assertFalse(errors)
+
+            # Test with non-existent directory
+            self.setup_env(
+                {
+                    "target": "x86_64-unknown-linux-gnu",
+                    "working-directory": "/path/to/nonexistent/directory",
+                }
+            )
+            validator = InputValidator("/root")
+            errors = validator.validate()
+            self.assertTrue(errors)
+
+            # Test with file instead of directory
+            with tempfile.NamedTemporaryFile() as temp_file:
+                self.setup_env(
+                    {
+                        "target": "x86_64-unknown-linux-gnu",
+                        "working-directory": temp_file.name,
+                    }
+                )
+                validator = InputValidator("/root")
+                errors = validator.validate()
+                self.assertTrue(errors)
+
+    def test_validate_boolean_flags(self) -> None:
+        """Test validation of boolean flags."""
+        boolean_flags = ["cache-cross-binary", "strip", "use-rust-cache"]
+
+        # Test valid boolean values
+        for flag in boolean_flags:
+            for value in ["true", "false"]:
+                self.setup_env({"target": "x86_64-unknown-linux-gnu", flag: value})
+                validator = InputValidator("/root")
+                errors = validator.validate()
+                self.assertFalse(errors, f"'{flag}' with '{value}' should be valid")
+
+        # Test invalid boolean values
+        for flag in boolean_flags:
+            self.setup_env({"target": "x86_64-unknown-linux-gnu", flag: "invalid"})
+            validator = InputValidator("/root")
+            errors = validator.validate()
+            self.assertTrue(errors, f"'{flag}' with 'invalid' should be invalid")
+
+    def test_validate_rust_cache_parameters(self) -> None:
+        """Test validation of rust cache parameters."""
+        # Valid JSON
+        self.setup_env(
+            {
+                "target": "x86_64-unknown-linux-gnu",
+                "rust-cache-parameters": '{"key1":"value1","key2":"value2"}',
+            }
+        )
+        validator = InputValidator("/root")
+        errors = validator.validate()
+        self.assertFalse(errors)
+
+        # Invalid JSON
+        self.setup_env(
+            {
+                "target": "x86_64-unknown-linux-gnu",
+                "rust-cache-parameters": "{invalid json",
+            }
+        )
+        validator = InputValidator("/root")
+        errors = validator.validate()
+        self.assertTrue(errors)
+
+
+if __name__ == "__main__":
+    if len(os.sys.argv) > 1 and os.sys.argv[1] == "--test":
+        unittest.main(argv=["unittest"])
+    else:
+        main()