From 419d66b4d1e37b40c8bdd3b6df990dbc76d68a1b Mon Sep 17 00:00:00 2001
From: James Eversole <jameseversole@imarc.com>
Date: Tue, 21 Jan 2025 16:58:04 -0600
Subject: [PATCH] All paths for caching cabal included :)

---
 .gitea/workflows/test-and-build.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/test-and-build.yml b/.gitea/workflows/test-and-build.yml
index 8934963..d5e0557 100644
--- a/.gitea/workflows/test-and-build.yml
+++ b/.gitea/workflows/test-and-build.yml
@@ -25,10 +25,11 @@ jobs:
         with:
           path: |
             ~/.cache/cabal
-            ~/.ghc
-          key: cabal-${{ runner.os }}-${{ hashFiles('tricu.cabal') }}
+            ~/.config/cabal
+            ~/.local/state/cabal
+          key: cabal-${{ hashFiles('tricu.cabal') }}
           restore-keys: |
-            cabal-${{ runner.os }}-
+            cabal-
 
       - name: Set up cache for Nix
         uses: actions/cache@v4
@@ -36,9 +37,9 @@ jobs:
           path: |
             /nix/store
             /nix/var/nix/cache
-          key: nix-${{ runner.os }}-${{ hashFiles('flake.lock') }}
+          key: nix-${{ hashFiles('flake.lock') }}
           restore-keys: |
-            nix-${{ runner.os }}-
+            nix-
 
       - name: Initialize Cabal and update package list
         run: |
@@ -64,10 +65,11 @@ jobs:
         with:
           path: |
             ~/.cache/cabal
-            ~/.ghc
-          key: cabal-${{ runner.os }}-${{ hashFiles('tricu.cabal') }}
+            ~/.config/cabal
+            ~/.local/state/cabal
+          key: cabal-${{ hashFiles('tricu.cabal') }}
           restore-keys: |
-            cabal-${{ runner.os }}-
+            cabal-
 
       - name: Set up cache for Nix
         uses: actions/cache@v4
@@ -75,9 +77,9 @@ jobs:
           path: |
             /nix/store
             /nix/var/nix/cache
-          key: nix-${{ runner.os }}-${{ hashFiles('flake.lock') }}
+          key: nix-${{ hashFiles('flake.lock') }}
           restore-keys: |
-            nix-${{ runner.os }}-
+            nix-
 
       - name: Build binary
         run: |