74-fixes: adjusted tested GHC versions & CI

bruderj15 · Aug 16, 2024 · 3ec8a78 · 3ec8a78
1 parent 37d40bb
commit 3ec8a78
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -1,16 +1,16 @@
 # This GitHub workflow config has been generated by a script via
 #
-#   haskell-ci 'github' '.\hasmtlib.cabal'
+#   haskell-ci 'github' 'hasmtlib.cabal'
 #
 # To regenerate the script (for example after adjusting tested-with) run
 #
 #   haskell-ci regenerate
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240514
+# version: 0.18.1
 #
-# REGENDATA ("0.19.20240514",["github",".\\hasmtlib.cabal"])
+# REGENDATA ("0.18.1",["github","hasmtlib.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,14 +23,24 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:jammy
+      image: buildpack-deps:bionic
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.5
+          - compiler: ghc-9.8.2
             compilerKind: ghc
-            compilerVersion: 9.6.5
+            compilerVersion: 9.8.2
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.6.4
+            compilerKind: ghc
+            compilerVersion: 9.6.4
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.4.8
+            compilerKind: ghc
+            compilerVersion: 9.4.8
             setup-method: ghcup
             allow-failure: false
       fail-fast: false
@@ -118,7 +128,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -146,15 +156,15 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(hasmtlib)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(hasmtlib)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
       - name: restore cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v3
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -181,7 +191,7 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v3
         if: always()
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,8 +14,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: sol/haskell-autotag@v1
         id: autotag
-      - run: ghcup install ghc 9.6.5
-      - run: ghcup set ghc 9.6.5
+      - run: ghcup install ghc 9.6.4
+      - run: ghcup set ghc 9.6.4
       - run: cabal sdist
       - run: cabal update
       - run: cabal haddock --haddock-for-hackage --enable-documentation

diff --git a/hasmtlib.cabal b/hasmtlib.cabal
@@ -19,8 +19,8 @@ build-type:            Simple
 extra-source-files:    README.md
 extra-doc-files:       CHANGELOG.md
 tested-with:           GHC == 9.4.8
-                     , GHC == 9.6.5
-                     , GHC == 9.10.1
+                     , GHC == 9.6.4
+                     , GHC == 9.8.2
 
 library
   hs-source-dirs:      src