v0.2.1.4-r1: allow newer tasty-quickcheck

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.19.20240422
+# version: 0.19.20240517
 #
-# REGENDATA ("0.19.20240422",["github","HsYAML.cabal"])
+# REGENDATA ("0.19.20240517",["github","HsYAML.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,9 +32,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.10.0.20240413
+          - compiler: ghc-9.10.1
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240413
+            compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2
@@ -101,7 +101,6 @@ jobs:
           mkdir -p "$HOME/.ghcup/bin"
           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" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
           "$HOME/.ghcup/bin/ghcup" install cabal 3.10.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
@@ -126,7 +125,7 @@ jobs:
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
-          if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
+          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
@@ -155,18 +154,6 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
-          if $HEADHACKAGE; then
-          cat >> $CABAL_CONFIG <<EOF
-          repository head.hackage.ghc.haskell.org
-             url: https://ghc.gitlab.haskell.org/head.hackage/
-             secure: True
-             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-             key-threshold: 3
-          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
-          EOF
-          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -218,10 +205,7 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
-          if $HEADHACKAGE; then
-          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
-          fi
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(HsYAML)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(HsYAML)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan

.github/workflows/stack.yml

@@ -21,9 +21,9 @@ jobs:
         os: [ubuntu-latest]
         plan:
           - ghc: '9.8.2'
-            resolver: 'nightly-2024-04-25'
-          - ghc: '9.6.4'
-            resolver: 'lts-22.18'
+            resolver: 'nightly-2024-06-22'
+          - ghc: '9.6.5'
+            resolver: 'lts-22.26'
           - ghc: '9.4.8'
             resolver: 'lts-21.25'
           - ghc: '9.2.8'
@@ -48,12 +48,12 @@ jobs:
           - os: windows-latest
             plan:
               ghc: '9.8.2'
-              resolver: 'nightly-2024-04-25'
+              resolver: 'nightly-2024-06-22'
 
           - os: macos-latest
             plan:
               ghc: '9.8.2'
-              resolver: 'nightly-2024-04-25'
+              resolver: 'nightly-2024-06-22'
 
     runs-on: ${{ matrix.os }}
     env:
@@ -72,7 +72,7 @@ jobs:
     - uses: actions/cache/restore@v4
       id: cache
       env:
-        key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-
+        key: ${{ runner.os }}-stack-${{ steps.setup.outputs.stack-version }}-ghc-${{ steps.setup.outputs.ghc-version }}
       with:
         path: ${{ steps.setup.outputs.stack-root }}
         key:  ${{ env.key }}-${{ github.sha }}

HsYAML.cabal

@@ -1,6 +1,7 @@
 cabal-version:       1.14
 name:                HsYAML
 version:             0.2.1.4
+x-revision:          1
 
 synopsis:            Pure Haskell YAML 1.2 processor
 homepage:            https://github.com/haskell-hvr/HsYAML
@@ -15,7 +16,7 @@ copyright:           2015-2018 Herbert Valerio Riedel
 category:            Text
 build-type:          Simple
 tested-with:
-  GHC == 9.10.0
+  GHC == 9.10.1
   GHC == 9.8.2
   GHC == 9.6.5
   GHC == 9.4.8
@@ -147,4 +148,4 @@ test-suite tests
                    -- lower bounds chosen from lts-11.22 (GHC 8.2)
                  , QuickCheck       >= 2.10.1   && < 2.16
                  , tasty            >= 1.0.1.1  && < 1.6
-                 , tasty-quickcheck >= 0.9.2    && < 0.11
+                 , tasty-quickcheck >= 0.9.2    && < 1

cabal.haskell-ci

@@ -1,8 +1,4 @@
 branches: master
-
--- Dropping building tests on GHC 7.x which ships a too old bytestring package.
--- installed: +all -binary -bytestring -transformers -text
-tests: >=8.0
 installed: +all
 
 -- constraint-set text-2.1