From d72b8872c192da2136b605c8ff1b9f9f82ee8a1c Mon Sep 17 00:00:00 2001
From: Cody <cody@codyq.dev>
Date: Fri, 28 Jul 2023 02:13:34 -0500
Subject: Ugggg workflows are so annoying

---
 .github/workflows/linting.yml | 31 +++++++++++++------------------
 .github/workflows/testing.yml | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index ba82e51..9a05bf1 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -7,13 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-deplint
       - run: rm rust-toolchain.toml
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
@@ -24,34 +17,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - run: rm rust-toolchain.toml
+
+      # Cache files like by target directory
       - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-lint
-      - run: rm rust-toolchain.toml
+          key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+      - uses: actions/cache@v3
+        with:
+          path: llvm
+          key: ${{ runner.os }}-llvm-15
+
+      # Prepare toolchain related stuff
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2023-06-19
-          components: clippy, rust-src
+          toolchain: ${{ matrix.rust }}
       - uses: KyleMayes/install-llvm-action@v1
         with:
           version: "15.0"
+
       - run: cargo clippy --all-features -- --deny warnings
   code-format:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}-fmt
       - run: rm rust-toolchain.toml
       - uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 6e3269d..66e67a9 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -16,6 +16,9 @@ jobs:
     runs-on: ${{ matrix.os }}-latest
     steps:
       - uses: actions/checkout@v3
+      - run: rm rust-toolchain.toml
+
+      # Cache files like by target directory
       - uses: actions/cache@v3
         with:
           path: |
@@ -23,11 +26,19 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-rustc-${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - run: rm rust-toolchain.toml
+
+      - uses: actions/cache@v3
+        with:
+          path: llvm
+          key: ${{ runner.os }}-llvm-15
+
+      # Prepare toolchain related stuff
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.rust }}
       - uses: KyleMayes/install-llvm-action@v1
         with:
           version: "15.0"
+
+      - run: cargo build --all-features
       - run: cargo test --all-features --no-fail-fast
-- 
cgit v1.2.3