JSON because ugh

This commit is contained in:
asonix 2024-02-07 19:28:12 -06:00
parent 97fcdc888b
commit 96686d6436
2 changed files with 8 additions and 8 deletions

View File

@ -3,9 +3,9 @@ description: Prepare an environment to build or test rust packages
inputs: inputs:
targets: targets:
description: "Array of targets to add to rustup" description: "JSON Array of targets to add to rustup"
required: false required: false
default: [] default: '[]'
runs: runs:
using: "composite" using: "composite"
@ -27,14 +27,14 @@ runs:
~/.cargo/git/db ~/.cargo/git/db
~/.rustup ~/.rustup
target/ target/
key: rust-${{ join(inputs.targets, '-') }}-${{ hashFiles('Cargo.toml') }}-${{ hashFiles('Cargo.lock')}} key: rust-${{ join(fromJSON(inputs.targets), '-') }}-${{ hashFiles('Cargo.toml') }}-${{ hashFiles('Cargo.lock')}}
- -
name: Install rustup and rust name: Install rustup and rust
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'
uses: https://github.com/dtolnay/rust-toolchain@1.75.0 uses: https://github.com/dtolnay/rust-toolchain@1.75.0
with: with:
components: clippy components: clippy
targets: ${{ join(inputs.targets, ',') }} targets: ${{ join(fromJSON(inputs.targets), ',') }}
- -
name: Install cargo-zigbuild name: Install cargo-zigbuild
if: steps.cache.outputs.cache-hit != 'true' if: steps.cache.outputs.cache-hit != 'true'

View File

@ -55,10 +55,10 @@ jobs:
name: Setup Rust name: Setup Rust
uses: https://git.asonix.dog/asonix/pict-rs/.forgejo/actions/prepare-rust@main uses: https://git.asonix.dog/asonix/pict-rs/.forgejo/actions/prepare-rust@main
with: with:
targets: targets: |
- x86_64-unknown-linux-musl ["x86_64-unknown-linux-musl",
- armv7-unknown-linux-musleabihf "armv7-unknown-linux-musleabihf",
- aarch64-unknown-linux-musl "aarch64-unknown-linux-musl"]
- -
name: Debug builds name: Debug builds
run: cargo zigbuild --target ${{ matrix.target }} run: cargo zigbuild --target ${{ matrix.target }}