Update the CI workflow

ZcashFoundation · Dec 6, 2024 · a07c8e7 · a07c8e7
1 parent 5638787
commit a07c8e7
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,40 +26,48 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust:
-          - stable
+        toolchain:
+          - rust-toolchain.toml
           - nightly
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/cargo@v1
+        if: matrix.toolchain == 'rust-toolchain.toml'
         with:
-          toolchain: ${{ matrix.rust }}
-          override: true
+          command: package
+      - run: rustup install ${{ matrix.toolchain }}
+        if: matrix.toolchain != 'rust-toolchain.toml'
       - uses: actions-rs/cargo@v1
+        if: matrix.toolchain != 'rust-toolchain.toml'
         with:
           command: package
+          toolchain: ${{ matrix.toolchain }}
 
   test-versions:
     name: Test Suite
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust:
-          - stable
+        toolchain:
+          - rust-toolchain.toml
           - nightly
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rs/cargo@v1
+        if: matrix.toolchain == 'rust-toolchain.toml'
         with:
-          toolchain: ${{ matrix.rust }}
-          override: true
+          command: test
+      - run: rustup install ${{ matrix.toolchain }}
+        if: matrix.toolchain != 'rust-toolchain.toml'
       - uses: actions-rs/cargo@v1
+        if: matrix.toolchain != 'rust-toolchain.toml'
         with:
           command: test
+          toolchain: ${{ matrix.toolchain }}
 
   test-os:
     name: Test Suite
@@ -78,19 +86,8 @@ jobs:
       # - name: install LLVM on Mac
       #   if: matrix.os == 'macOS-latest'
       #   run: brew install llvm
-      - uses: actions-rs/toolchain@v1
+      - run: rustup target add x86_64-pc-windows-msvc
         if: matrix.os == 'windows-latest'
-        with:
-          target: x86_64-pc-windows-msvc
-          toolchain: stable
-          profile: minimal
-          override: true
-      - uses: actions-rs/toolchain@v1
-        if: matrix.os != 'windows-latest'
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
       - uses: actions-rs/cargo@v1
         if: matrix.os == 'windows-latest'
         with:
@@ -108,8 +105,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: rustup show
-      - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -122,8 +117,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: rustup show
-      - run: rustup component add clippy
       - uses: actions-rs/cargo@v1
         with:
           command: clippy