Merge pull request #1 from haskell-pkg-janitors/bump-ci

bump versions of GHC we run in CI
haskell-pkg-janitors · Mar 16, 2023 · 47a4746 · 47a4746
2 parents ab4f09c + cddd78a
commit 47a4746
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,31 +11,26 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         ghc:
-          - 8.8.4
-          - 8.10.7
-          - 9.0.1
-          - 9.2.1
+          - 9.2.7
+          - 9.4.4
+          - 9.6.1
       fail-fast: false
-    continue-on-error: ${{ startsWith(matrix.os, 'windows') && startsWith(matrix.ghc, '9.2') }}
-
+
     steps:
     - uses: actions/checkout@v2
 
-    - uses: haskell/actions/setup@v1
+    - uses: haskell/actions/setup@v2
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
         ghc-version: ${{ matrix.ghc }}
 
-    - name: Freeze
-      run: |
-        cabal freeze
-
-    - uses: actions/cache@v2
-      name: Cache ~/.cabal/store
+    - name: Restore cache
+      uses: actions/cache/restore@v3
       with:
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
         path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
 
     - name: Build
       run: |
@@ -45,3 +40,10 @@ jobs:
     - name: Test
       run: |
         cabal test all
+
+    - name: Save cache
+      uses: actions/cache/save@v3
+      if: always()
+      with:
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
+        path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}