From 94711387916acc24318e4ebf438c1c90bb4a2be6 Mon Sep 17 00:00:00 2001
From: Dirk Stolle <striezel-dev@web.de>
Date: Fri, 24 Mar 2023 02:44:08 +0100
Subject: [PATCH] Replace unmaintained actions-rs/* actions in CI workflows
 (#79)

Basically all of the `actions-rs/*` actions are unmaintained. See
<https://github.com/actions-rs/toolchain/issues/216> for more
information. Due to their age they generate several warnings in
CI runs.

To get rid of those warnings the occurrences of
`actions-rs/toolchain` are replaced by `dtolnay/rust-toolchain`,
and the occurrences of `actions-rs/cargo` are replaced by direct
invocations of `cargo`.
---
 .github/workflows/concat-kdf.yml | 10 +++-------
 .github/workflows/hkdf.yml       | 10 +++-------
 .github/workflows/workspace.yml  | 13 +++----------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/concat-kdf.yml b/.github/workflows/concat-kdf.yml
index 8e73980..fbebf1d 100644
--- a/.github/workflows/concat-kdf.yml
+++ b/.github/workflows/concat-kdf.yml
@@ -29,12 +29,10 @@ jobs:
           - wasm32-unknown-unknown
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   test:
@@ -46,11 +44,9 @@ jobs:
           - stable
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          override: true
       - run: cargo check --all-features
       - run: cargo test --no-default-features
       - run: cargo test
diff --git a/.github/workflows/hkdf.yml b/.github/workflows/hkdf.yml
index 71ad0f0..0f10c50 100644
--- a/.github/workflows/hkdf.yml
+++ b/.github/workflows/hkdf.yml
@@ -30,12 +30,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: RustCrypto/actions/cargo-cache@master
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
+          targets: ${{ matrix.target }}
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   minimal-versions:
@@ -53,11 +51,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: RustCrypto/actions/cargo-cache@master
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          override: true
       - run: cargo check --all-features
       - run: cargo test --no-default-features
       - run: cargo test
diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
index 4ea2932..02a2884 100644
--- a/.github/workflows/workspace.yml
+++ b/.github/workflows/workspace.yml
@@ -15,12 +15,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: RustCrypto/actions/cargo-cache@master
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: 1.56.0 # MSRV
           components: clippy
-          override: true
       - run: cargo clippy --all -- -D warnings
 
   rustfmt:
@@ -30,14 +28,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        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:
-          command: fmt
-          args: --all -- --check
+        run: cargo fmt --all -- --check