From 4f30d51bb240b540cf8fd9467208b76e3c49e0c3 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Mon, 20 Oct 2025 01:18:28 -0700 Subject: [PATCH] make sure rust toolchain is from rust-toolchain.toml in github workflows --- .github/workflows/ci-code.yaml | 15 ++++++--------- .github/workflows/publish.yaml | 5 ++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-code.yaml b/.github/workflows/ci-code.yaml index 740c99d..f4ed23d 100644 --- a/.github/workflows/ci-code.yaml +++ b/.github/workflows/ci-code.yaml @@ -26,10 +26,9 @@ jobs: with: persist-credentials: false - - name: 'install nightly rust toolchain with rustfmt' + - name: 'install rust toolchain with rustfmt' run: | - rustup update --no-self-update nightly - rustup default nightly + cargo version rustup component add rustfmt - name: 'cargo fmt' @@ -57,10 +56,9 @@ jobs: with: persist-credentials: false - - name: 'install nightly rust toolchain' + - name: 'install rust toolchain' run: | - rustup update --no-self-update nightly - rustup default nightly + cargo version - name: cargo build run: cargo build --target "${TARGET_ARCH}-unknown-uefi" @@ -87,10 +85,9 @@ jobs: with: persist-credentials: false - - name: 'install nightly rust toolchain with clippy' + - name: 'install rust toolchain with clippy' run: | - rustup update --no-self-update nightly - rustup default stable + cargo version rustup component add clippy - name: cargo clippy diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index eb36def..409f711 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -39,10 +39,9 @@ jobs: with: persist-credentials: false - - name: 'install nightly rust toolchain' + - name: 'install rust toolchain' run: | - rustup update --no-self-update nightly - rustup default nightly + cargo version - name: 'assemble artifacts' run: ./hack/assemble.sh