ci: move to dtolnay/rust-toolchain

iqlusioninc · Jun 26, 2024 · e8403b3 · e8403b3
1 parent 581906d
commit e8403b3
Showing 1 changed file with 8 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,33 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform:
+        target:
           - ubuntu-latest
           - macos-latest
         toolchain:
           - stable
           - 1.67.0 # MSRV
     steps:
       - uses: actions/checkout@v1
-      - name: cache .cargo/registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('Cargo.lock') }}
-      - name: cache .cargo/git
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
-      - name: cache target
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-rust-${{ matrix.toolchain }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: cargo build --release
       - run: cargo build --release --no-default-features
       - run: cargo build --release --no-default-features --features=passwords
@@ -51,46 +36,29 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform:
+        target:
           - ubuntu-latest
           - macos-latest
         toolchain:
           - stable
           - 1.67.0 # MSRV
     steps:
       - uses: actions/checkout@v1
-      - name: cache .cargo/registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('Cargo.lock') }}
-      - name: cache .cargo/git
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
-      - name: cache target
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-rust-${{ matrix.toolchain }}-cargo-build-target-${{ hashFiles('Cargo.lock') }}
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: cargo test --features=mockhsm,secp256k1,untested
 
   rustfmt:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
           components: rustfmt
-          override: true
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1
         with:
@@ -101,12 +69,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: 1.71.0 # pinned to prevent CI breakages
           components: clippy
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: clippy