wip

cdepillabout · Oct 22, 2023 · 0bbdbbe · 0bbdbbe
1 parent b3cfc1e
commit 0bbdbbe
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -160,21 +160,19 @@ jobs:
       #
       # Just need to load this into a variable, and throw it in the following key name
       - uses: actions/cache@v3
-        name: Cache ~/.config/cabal/store
+        name: Cache cabal store
         with:
-          path: ~/.config/cabal/store
-          key: nix-simple-cabal-shell-dot-config-cabal-store
-      - uses: actions/cache@v3
-        name: Cache ~/.cabal/store
-        with:
-          path: ~/.cabal/store
-          key: nix-simple-cabal-shell-dot-cabal-store
+          path: |
+            ~/.cabal/store
+            ~/.config/cabal/store
+            ~/.local/state/cabal/store
+          key: nix-simple-cabal-shell
 
       - name: cabal update
         run: nix-shell ./.nix-helpers/simple-cabal-shell.nix --command 'cabal update -v'
 
       - name: cabal build
-        run: nix-shell ./.nix-helpers/simple-cabal-shell.nix --command 'cabal build all -v --enable-tests --enable-benchmarks && cabal -v v2-exec -- ghc-pkg list -v'
+        run: nix-shell ./.nix-helpers/simple-cabal-shell.nix --command 'cabal build all -v --enable-tests --enable-benchmarks'
 
       - name: test test test
         run: |