From 059ebedc85d3d3d4dc6f980d7c9d59394143486a Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 10 Aug 2026 08:37:35 -0500 Subject: [PATCH] chore(ci): Remove dtolnay/rust-toolchain This causes enough issues with zizmor --- .github/workflows/ci.yml | 44 +++++++++++---------------------- .github/workflows/rust-next.yml | 9 +++---- .github/zizmor.yml | 4 --- 3 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 .github/zizmor.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b854c5fd..5cdca389 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ env: RUST_BACKTRACE: 1 CARGO_TERM_COLOR: always CLICOLOR: 1 + CARGO_INCREMENTAL: 0 + RUST_TOOLCHAIN_STABLE: "1.97" # STABLE concurrency: group: "${{ github.workflow }}-${{ github.ref }}" @@ -47,9 +49,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: ${{ matrix.rust }} + run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install cargo-hack @@ -72,9 +72,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: stable + run: rustup update --no-self-update stable && rustup default stable - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install cargo-hack @@ -95,13 +93,9 @@ jobs: with: persist-credentials: false - name: Install stable Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: stable + run: rustup update --no-self-update stable && rustup default stable - name: Install nightly Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: nightly + run: rustup update --no-self-update nightly && rustup default nightly - name: Downgrade dependencies to minimal versions run: cargo +nightly generate-lockfile -Z minimal-versions - name: Compile with minimal versions @@ -114,9 +108,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: stable + run: rustup update --no-self-update stable && rustup default stable - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: "Is lockfile updated?" @@ -130,9 +122,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: "1.97" # STABLE + run: rustup update --no-self-update $RUST_TOOLCHAIN_STABLE && rustup default $RUST_TOOLCHAIN_STABLE - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Check documentation @@ -148,10 +138,9 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: "1.97" # STABLE - components: rustfmt + run: rustup update --no-self-update $RUST_TOOLCHAIN_STABLE && rustup default $RUST_TOOLCHAIN_STABLE + - name: Install rustfmt + run: rustup component add rustfmt - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Check formatting @@ -167,10 +156,9 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: "1.97" # STABLE - components: clippy + run: rustup update --no-self-update $RUST_TOOLCHAIN_STABLE && rustup default $RUST_TOOLCHAIN_STABLE + - name: Install clippy + run: rustup component add clippy - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install SARIF tools @@ -204,9 +192,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: stable + run: rustup update --no-self-update stable && rustup default stable - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install cargo-tarpaulin diff --git a/.github/workflows/rust-next.yml b/.github/workflows/rust-next.yml index a9875b2d..16c5b744 100644 --- a/.github/workflows/rust-next.yml +++ b/.github/workflows/rust-next.yml @@ -11,6 +11,7 @@ env: RUST_BACKTRACE: 1 CARGO_TERM_COLOR: always CLICOLOR: 1 + CARGO_INCREMENTAL: 0 concurrency: group: "${{ github.workflow }}-${{ github.ref }}" @@ -37,9 +38,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: ${{ matrix.rust }} + run: rustup update --no-self-update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install cargo-hack @@ -64,9 +63,7 @@ jobs: with: persist-credentials: false - name: Install Rust - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable - with: - toolchain: stable + run: rustup update --no-self-update stable && rustup default stable - name: Initialize cache uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 - name: Install cargo-hack diff --git a/.github/zizmor.yml b/.github/zizmor.yml deleted file mode 100644 index 45aa9c94..00000000 --- a/.github/zizmor.yml +++ /dev/null @@ -1,4 +0,0 @@ -rules: - superfluous-actions: - # https://github.com/zizmorcore/zizmor/issues/1817 - disable: true