From 61d84a21200eaa04e10c7c6061a084e04e748312 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Tue, 22 Nov 2022 12:12:57 -0600
Subject: [PATCH] Manually install toolchain before cache to eliminate a
 deprecated action and hopefully fix checksum validation failures.

---
 .github/workflows/release.yml | 22 +++-------------------
 .github/workflows/test.yml    | 30 ++++--------------------------
 2 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cbed250..a28727d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,15 +14,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
       - run: sudo apt-get update; sudo apt-get install -y libspeechd-dev
         if: ${{ runner.os == 'Linux' }}
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -53,14 +48,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          target: wasm32-unknown-unknown
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -89,13 +78,8 @@ jobs:
       CARGO_TOKEN: ${{ secrets.CARGO_TOKEN }}
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          target: wasm32-unknown-unknown
-          profile: minimal
-          toolchain: stable
-          override: true
       - run: |
           sudo apt-get update
           sudo apt-get install -y libspeechd-dev
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1fb195..b76fdc8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,15 +13,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
       - run: sudo apt-get update; sudo apt-get install -y libspeechd-dev
         if: ${{ runner.os == 'Linux' }}
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -52,14 +47,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          target: wasm32-unknown-unknown
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: check
@@ -78,13 +67,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/install@v0.1
         with:
           crate: cargo-apk
@@ -100,14 +84,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+      - run: rustup toolchain install stable
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          target: wasm32-unknown-unknown
-          profile: minimal
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
       - uses: actions-rs/install@v0.1
         with:
           crate: cargo-make