v0.4.8-r1: allow newer tasty-quickcheck

josefs · Jun 25, 2024 · 66828dd · 66828dd
1 parent fcfede9
commit 66828dd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 25 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231112
+# version: 0.19.20240517
 #
-# REGENDATA ("0.17.20231112",["github","STMonadTrans.cabal"])
+# REGENDATA ("0.19.20240517",["github","STMonadTrans.cabal"])
 #
 name: Haskell-CI
 on:
@@ -27,19 +27,24 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:focal
+      image: buildpack-deps:jammy
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.1
+          - compiler: ghc-9.10.1
             compilerKind: ghc
-            compilerVersion: 9.8.1
+            compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.6.3
+          - compiler: ghc-9.8.2
             compilerKind: ghc
-            compilerVersion: 9.6.3
+            compilerVersion: 9.8.2
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.6.5
+            compilerKind: ghc
+            compilerVersion: 9.6.5
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
@@ -97,7 +102,7 @@ jobs:
           curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -115,7 +120,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
           echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -200,15 +205,15 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(STMonadTrans)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(STMonadTrans)$/; }' >> 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@v3
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -238,7 +243,7 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: always()
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -21,11 +21,11 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          ghc: 9.8.1
-          resolver: nightly-2024-01-04
+          ghc: 9.8.2
+          resolver: nightly-2024-06-22
         - os: ubuntu-latest
-          ghc: 9.6.3
-          resolver: lts-22.4
+          ghc: 9.6.5
+          resolver: lts-22.26
         - os: ubuntu-latest
           ghc: 9.4.8
           resolver: lts-21.25
@@ -69,7 +69,7 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install GHC and stack with haskell-actions/setup
       uses: haskell-actions/setup@v2
@@ -95,7 +95,7 @@ jobs:
     ########################################################################
 
     - name: Restore cached stack pantry
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       id:   cache-pantry
       with:
         path: ${{ steps.setup.outputs.stack-root }}/pantry
@@ -108,7 +108,7 @@ jobs:
 
     - name: Cache stack pantry
       if:   steps.cache-pantry.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v3
+      uses: actions/cache/save@v4
       with:
         path: ${{ steps.setup.outputs.stack-root }}/pantry
         key:  ${{ steps.cache-pantry.outputs.cache-primary-key }}
@@ -120,7 +120,7 @@ jobs:
       run:  ${{ env.stack }} test --dry-run > '.build-plan.txt'
 
     - name: Restore cached dependencies
-      uses: actions/cache/restore@v3
+      uses: actions/cache/restore@v4
       id:   cache-deps
       with:
         path: |
@@ -137,7 +137,7 @@ jobs:
 
     - name: Cache dependencies
       if:   steps.cache-deps.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v3
+      uses: actions/cache/save@v4
       with:
         path: |
           ${{ steps.setup.outputs.stack-root }}/stack.sqlite3

diff --git a/STMonadTrans.cabal b/STMonadTrans.cabal
@@ -1,6 +1,7 @@
 cabal-version:  1.18
 name:           STMonadTrans
 version:        0.4.8
+x-revision:     1
 license:        BSD3
 license-file:   LICENSE
 author:         Josef Svenningsson
@@ -21,8 +22,9 @@ description:
    Maybe and combinations of their corresponding monad transformers.
 
 Tested-With:
-  GHC == 9.8.1
-  GHC == 9.6.3
+  GHC == 9.10.1
+  GHC == 9.8.2
+  GHC == 9.6.5
   GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2
@@ -79,5 +81,5 @@ test-suite test
     , base
     , transformers
     , tasty            >= 0.11.0.4 && < 1.6
-    , tasty-quickcheck >= 0.8.4    && < 0.11
+    , tasty-quickcheck >= 0.8.4    && < 1
     , tasty-hunit      >= 0.9.2    && < 0.11
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,4 @@
-0.4.8 -- 2023-01-04
+0.4.8 -- 2024-01-04
 
   * Added `Alternative` instance for `STT`, by William Rusnack
     (PR [#33](https://github.com/josefs/STMonadTrans/pull/33)).