From 8f081ff5db115de44313c9db09415c359bf2ca01 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 11 Oct 2026 12:41:17 -0400 Subject: [PATCH] fix(ci): pass toolchain explicitly to SHA-pinned dtolnay/rust-toolchain (#1) dtolnay/rust-toolchain derives the toolchain from the ref it is called at (@stable, @1.90). Pinned to a commit SHA, that ref carries no toolchain, so the action fails with "'toolchain' is a required input". This broke the Windows ARM64 workflow on every craft app's main (e.g. storytold/wordcraft run on 860f4ca) and would break the macOS, Windows, Linux, web and riscv64 release jobs the same way. Pass toolchain: stable at every call site. Co-authored-by: Claude Opus 5.5 --- .github/workflows/release.yml | 6 ++++++ .github/workflows/windows-arm64.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54de670..f7f63cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -168,6 +168,7 @@ jobs: ref: ${{ inputs.craft-fonts-ref }} - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 with: + toolchain: stable targets: aarch64-apple-darwin, x86_64-apple-darwin - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: @@ -274,6 +275,7 @@ jobs: ref: ${{ inputs.craft-fonts-ref }} - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 with: + toolchain: stable targets: ${{ matrix.target }} - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: @@ -375,6 +377,8 @@ jobs: deb-arch: ${{ matrix.deb }} nfpm-version: ${{ inputs.nfpm-version }} - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 + with: + toolchain: stable - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: key: release-linux-${{ matrix.arch }} @@ -640,6 +644,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 with: + toolchain: stable targets: wasm32-unknown-unknown - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: @@ -719,6 +724,7 @@ jobs: ref: ${{ inputs.craft-fonts-ref }} - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 with: + toolchain: stable targets: riscv64gc-unknown-linux-gnu - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: diff --git a/.github/workflows/windows-arm64.yml b/.github/workflows/windows-arm64.yml index 0d62b33..42eb2ef 100644 --- a/.github/workflows/windows-arm64.yml +++ b/.github/workflows/windows-arm64.yml @@ -48,6 +48,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - uses: dtolnay/rust-toolchain@e2a55d2ffb04f378e9626c28d38b36d230d1e12f # v1 with: + toolchain: stable targets: aarch64-pc-windows-msvc - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2 with: