Use newer cabal in test action

viercc · Apr 6, 2023 · 5fccfa0 · 5fccfa0
1 parent 52b94a0
commit 5fccfa0
Showing 1 changed file with 6 additions and 35 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  cabal-version: '3.10.1.0'
+
 jobs:
   build:
     strategy:
@@ -25,52 +28,20 @@ jobs:
             ~/.ghcup
             ~/.cabal
             dist-newstyle
+            test-bin
           key: ${{ runner.os }}-${{ matrix.ghc }}-env
 
       - name: Setup Haskell
         run: |
-          ghcup install ghc ${{ matrix.ghc }}
-          ghcup set ghc ${{ matrix.ghc }}
-          ghcup install cabal
+          ghcup install ghc ${{ matrix.ghc }} --set
+          ghcup install cabal ${{ cabal-version }} --set
       
       - name: Install dependencies
         run: |
           cabal update
           cabal build --only-dependencies --enable-tests --enable-benchmarks
       - name: Build
         run: cabal v2-build --write-ghc-environment-files=always --enable-tests --enable-benchmarks all
-
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ghc: ['9.0.2', '9.2.7', '9.4.4', '9.6.1']
-    needs: build
-    name: Test on GHC ${{ matrix.ghc }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache
-        id: restore-cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.ghcup
-            ~/.cabal
-            dist-newstyle
-          key: ${{ runner.os }}-${{ matrix.ghc }}-env
-
-      - name: 'Guard(cache was restored)'
-        if: ${{ !(steps.restore-cache.outputs.cache-hit) }}
-        run: exit 1
-
-      - name: Setup Haskell
-        run: |
-          ghcup install ghc ${{ matrix.ghc }}
-          ghcup set ghc ${{ matrix.ghc }}
-          ghcup install cabal
 
       - name: Run tests
         run: cabal v2-test --write-ghc-environment-files=always matchable:matchable-test matchable-th:matchable-th-test