diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index f22e6eb3..f811945d 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: stable diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml index ec29f8fa..cf1c661d 100644 --- a/.github/workflows/build_releases.yml +++ b/.github/workflows/build_releases.yml @@ -135,7 +135,7 @@ jobs: - name: Set up Rust toolchain if: matrix.info.container == '' - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: ${{ matrix.info.rust || 'stable' }} target: ${{ matrix.info.target }} @@ -241,7 +241,7 @@ jobs: args: install -y wixtoolset - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: stable target: x86_64-pc-windows-msvc @@ -351,7 +351,7 @@ jobs: fetch-depth: 1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: ${{ matrix.info.rust || 'stable' }} target: ${{ matrix.info.target }} @@ -455,7 +455,7 @@ jobs: fetch-depth: 1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: ${{ matrix.info.rust || 'stable' }} target: ${{ matrix.info.target }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d19b0f65..3d5cb94c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: stable components: rustfmt, clippy @@ -153,32 +153,23 @@ jobs: os: "ubuntu-latest", target: "i686-unknown-linux-gnu", cross: true, - rust: stable, } - { os: "ubuntu-latest", target: "x86_64-unknown-linux-musl", cross: false, - rust: stable, } - { os: "ubuntu-latest", target: "i686-unknown-linux-musl", cross: true, - rust: stable, } - - { - os: "windows-2019", - target: "i686-pc-windows-msvc", - cross: false, - rust: stable, - } + - { os: "windows-2019", target: "i686-pc-windows-msvc", cross: false } - { os: "windows-2019", target: "x86_64-pc-windows-gnu", cross: false, - rust: stable, } # Beta @@ -186,19 +177,19 @@ jobs: os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", cross: false, - rust: beta, + rust: "beta", } - { os: "macos-12", target: "x86_64-apple-darwin", cross: false, - rust: beta, + rust: "beta", } - { os: "windows-2019", target: "x86_64-pc-windows-msvc", cross: false, - rust: beta, + rust: "beta", } # armv7 @@ -206,7 +197,6 @@ jobs: os: "ubuntu-latest", target: "armv7-unknown-linux-gnueabihf", cross: true, - rust: stable, } # armv6 @@ -214,7 +204,6 @@ jobs: os: "ubuntu-latest", target: "arm-unknown-linux-gnueabihf", cross: true, - rust: stable, } # PowerPC 64 LE @@ -222,7 +211,6 @@ jobs: os: "ubuntu-latest", target: "powerpc64le-unknown-linux-gnu", cross: true, - rust: stable, } # Risc-V 64gc @@ -230,7 +218,6 @@ jobs: os: "ubuntu-latest", target: "riscv64gc-unknown-linux-gnu", cross: true, - rust: stable, } # Android ARM64 @@ -238,7 +225,6 @@ jobs: os: "ubuntu-latest", target: "aarch64-linux-android", cross: true, - rust: stable, cross-version: "git:cabfc3b02d1edec03869fabdabf6a7f8b0519160", no-default-features: true, } @@ -248,9 +234,9 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: - toolchain: ${{ matrix.info.rust }} + toolchain: ${{ matrix.info.rust || 'stable' }} target: ${{ matrix.info.target }} - name: Enable Rust cache diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d155587b..8a9f25b5 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -50,7 +50,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a + uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17 with: toolchain: stable diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index 4d2dee85..00000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "1.80.0"