diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 99906707cf3..d1075152e99 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,10 +50,9 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: components: clippy - toolchain: stable - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: @@ -170,7 +169,9 @@ jobs: restore-keys: | cargo-check-${{ runner.os }}-${{ matrix.target }}- - - run: rustup toolchain install stable --target "${{ matrix.target }}" + - uses: dtolnay/rust-toolchain@stable + with: + target: ${{ matrix.target }} - name: Setup Android NDK if: ${{ matrix.target == 'aarch64-linux-android' }} @@ -251,9 +252,7 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 - with: - toolchain: stable + - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: @@ -366,9 +365,8 @@ jobs: with: python-version: ${{ env.PYTHON_VERSION }} - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable components: rustfmt - uses: cargo-bins/cargo-binstall@113a77a4ce971c41332f2129c3d995df993cf746 # v1.17.8 @@ -425,7 +423,7 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.NIGHTLY_CHANNEL }} components: miri @@ -451,10 +449,9 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: components: clippy - toolchain: stable - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: @@ -529,10 +526,9 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: target: wasm32-wasip1 - toolchain: stable - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f06f0d3adc6..ae6c9da9b74 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: target: ${{ matrix.target }} @@ -89,7 +89,7 @@ jobs: with: persist-credentials: false - - uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 + - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-wasip1 diff --git a/.github/zizmor.yml b/.github/zizmor.yml new file mode 100644 index 00000000000..f22f76b70d8 --- /dev/null +++ b/.github/zizmor.yml @@ -0,0 +1,14 @@ +rules: + unpinned-uses: + config: + policies: + # dtolnay/rust-toolchain is a trusted action that uses lightweight branch + # refs (@stable, @nightly, etc.) by design. Pinning to a hash would break + # the intended usage pattern. + # We can remove this once https://github.com/dtolnay/rust-toolchain/issues/180 is resolved + dtolnay/rust-toolchain: any + # dtolnay/rust-toolchain handles component installation, target addition, and + # override configuration beyond what a bare `rustup` invocation provides. + # See: https://github.com/zizmorcore/zizmor/issues/1817 + superfluous-actions: + disable: true