[ci] switch to dtolnay/rust-toolchain

actions-rs is deprecated and unmaintained.
nextest-rs · Oct 19, 2022 · f5131d6 · f5131d6
1 parent d41d61b
commit f5131d6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,10 +16,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
           components: rustfmt, clippy
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
       - name: Lint (clippy)
@@ -51,9 +49,9 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
+          components: rustfmt, clippy
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
       - name: Build rustdoc
         uses: actions-rs/cargo@v1
@@ -75,10 +73,9 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust-version }}
-          override: true
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
         with:
           # Matrix instances (other than OS) need to be added to this explicitly
@@ -132,18 +129,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - name: Install host toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          profile: minimal
-      - name: Install x86_64-pc-windows-gnu toolchain
-        uses: actions-rs/toolchain@v1
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          target: x86_64-pc-windows-gnu
-          profile: minimal
+          targets: x86_64-pc-windows-gnu
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
       - name: Install wine and gcc-mingw-w64-x86-64-win32
         run: |

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,9 +18,8 @@ jobs:
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
           components: llvm-tools-preview
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,10 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@c5ed9ba6b7e1bb8aff90d43acd2f0af4990fa57c
       - name: Install static-sitemap-cli
         run: npm install static-sitemap-cli

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -18,17 +18,12 @@ jobs:
       RUSTFLAGS: -D warnings
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      # Caching adapted from
-      # https://github.com/unicode-org/icu4x/blob/2d64d81d4661090c0d446b7bd700e65035840a5e/.github/workflows/build-test.yml#L32-L50.
+      - uses: dtolnay/rust-toolchain@stable
       - name: Install cargo-hakari
         uses: baptiste0928/cargo-install@v1
         with:
           crate: cargo-hakari
-          version: "0.9"  # Most recent version compatible with 0.9        id: install-cargo-search2
+          version: "0.9"  # Most recent version compatible with 0.9
       - name: Check workspace-hack Cargo.toml is up-to-date
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -113,12 +113,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
           bin: cargo-nextest
@@ -158,11 +155,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
+        uses: dtolnay/rust-toolchain@stable
       - name: Build release for Mac
         id: build-release
         run: |

diff --git a/site/src/book/test-coverage.md b/site/src/book/test-coverage.md
@@ -16,10 +16,8 @@ cargo llvm-cov nextest
 Install nightly Rust with the `llvm-tools-preview` component, nextest, and llvm-cov in GitHub Actions. Then, run `cargo llvm-cov nextest`.
 
 ```yaml
-- uses: actions-rs/toolchain@v1
+- uses: dtolnay/rust-toolchain@nightly
   with:
-    toolchain: nightly
-    override: true
     components: llvm-tools-preview
 - uses: taiki-e/install-action@cargo-llvm-cov
 - uses: taiki-e/install-action@nextest