Reconfigure gh-actions using updo

cabalism · May 20, 2024 · 763ab11 · 763ab11
1 parent 8283a71
commit 763ab11
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -12,31 +12,32 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cabal: ["3.6"]
-        ghc:
-          - "8.8.4"
-          - "8.10.7"
-          - "9.0.2"
-          - "9.2.2"
+        cabal: ["3.10"]
+        vers:
+          - {ghc: "9.2.8", stackage: "lts-20.26"}
+          - {ghc: "9.4.8", stackage: "lts-21.25"}
+          - {ghc: "9.6.5", stackage: "lts-22.22"}
+          - {ghc: "9.8.2", stackage: "nightly-2024-05-18"}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - uses: haskell/actions/setup@v1
       name: setup GHC and cabal-install
       with:
-        ghc-version: ${{ matrix.ghc }}
+        ghc-version: ${{ matrix.vers.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
     - uses: actions/cache@v2
       name: cache ~/.cabal/store
       with:
         path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.ghc }}-cabal
+        key: ${{ runner.os }}-${{ matrix.cabal }}-${{ matrix.vers.ghc }}-cabal
 
     - name: build
       run: |
         cabal update
+        GHC_VERSION=${{ matrix.vers.ghc }} STACKAGE_VERSION=${{ matrix.vers.stackage }} make -f project-files.mk
         cabal build all --enable-tests
 
     - name: test golden

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -11,12 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cabal: ["3.6"]
-        ghc:
-          - "9.0.2"
+        cabal: ["3.10"]
+        vers:
+          - {ghc: "9.2.8", stackage: "lts-20.26"}
+          - {ghc: "9.4.8", stackage: "lts-21.25"}
+          - {ghc: "9.6.5", stackage: "lts-22.22"}
+          - {ghc: "9.8.2", stackage: "nightly-2024-05-18"}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - uses: haskell/actions/setup@v1
       name: setup stack
@@ -29,10 +32,12 @@ jobs:
       name: cache ~/.stack
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ matrix.ghc }}-stack
+        key: ${{ runner.os }}-${{ matrix.vers.ghc }}-stack
 
     - name: build tests
-      run: stack test --no-run-tests --no-terminal --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml
+      run: |
+        GHC_VERSION=${{ matrix.vers.ghc }} STACKAGE_VERSION=${{ matrix.vers.stackage }} make -f project-files.mk
+        stack test --no-run-tests --no-terminal
 
     - name: test golden
       run: stack test hpack-dhall:golden --no-terminal --test-arguments "--color=always" --stack-yaml=./stack/stack-${{ matrix.ghc }}.yaml