ci: actions-rust-lang/setup-rust-toolchain is better

- It uses `rust-toolchain.toml` by default - Has built-in support for `Swatinem/rust-cache
azzamsa · Dec 8, 2023 · 67fa2b6 · 67fa2b6
1 parent 8867e02
commit 67fa2b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,15 +8,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: clippy, rustfmt
 
-      - uses: Swatinem/rust-cache@v2
-
       - uses: taiki-e/install-action@just
       - uses: taiki-e/install-action@dprint
       - uses: taiki-e/install-action@v2
@@ -36,12 +33,7 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v3
 
-      - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
-
-      - uses: Swatinem/rust-cache@v2
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - uses: taiki-e/install-action@just
       - uses: taiki-e/install-action@nextest
@@ -70,24 +62,17 @@ jobs:
 
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           target: ${{ matrix.target }}
 
-      - uses: Swatinem/rust-cache@v2
-
       - name: Show version information
         shell: bash
         run: |
-          gcc --version || true
-          rustup -V
-          rustup toolchain list
-          rustup default
-          cargo -V
-          rustc -V
+          rustc --version
+          cargo --version
 
       - name: Install musl-tools
         if: matrix.target == 'x86_64-unknown-linux-musl'

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.73.0"
+components = ["rustfmt", "clippy"]