@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.19.20240514
11+# version: 0.19.20240702
1212#
13−# REGENDATA ("0.19.20240514",["github","cabal.project"])
13+# REGENDATA ("0.19.20240702",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -42,9 +42,9 @@ jobs:
4242 compilerVersion: 9.8.2
4343 setup-method: ghcup
4444 allow-failure: false
45− - compiler: ghc-9.6.5
45+ - compiler: ghc-9.6.6
4646 compilerKind: ghc
47− compilerVersion: 9.6.5
47+ compilerVersion: 9.6.6
4848 setup-method: ghcup
4949 allow-failure: false
5050 - compiler: ghc-9.4.8
@@ -87,7 +87,7 @@ jobs:
8787 curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8888 chmod a+x "$HOME/.ghcup/bin/ghcup"
8989 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
90+ "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9191 env:
9292 HCKIND: ${{ matrix.compilerKind }}
9393 HCNAME: ${{ matrix.compiler }}
@@ -105,7 +105,7 @@ jobs:
105105 echo "HC=$HC" >> "$GITHUB_ENV"
106106 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107107 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
108− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -169,7 +169,7 @@ jobs:
169169 run: |
170170 touch cabal.project
171171 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
172− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project ; fi
172+ echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project
173173 cat cabal.project
174174 - name: sdist
175175 run: |
@@ -189,11 +189,11 @@ jobs:
189189 touch cabal.project
190190 touch cabal.project.local
191191 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
192− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: ${PKGDIR_uuid}" >> cabal.project ; fi
192+ echo "packages: ${PKGDIR_uuid}" >> cabal.project
193193 echo "package uuid-types" >> cabal.project
194194 echo " ghc-options: -Werror=missing-methods" >> cabal.project
195− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
196− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
195+ echo "package uuid" >> cabal.project
196+ echo " ghc-options: -Werror=missing-methods" >> cabal.project
197197 cat >> cabal.project <<EOF
198198 EOF
199199 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
@@ -226,8 +226,8 @@ jobs:
226226 run: |
227227 cd ${PKGDIR_uuid_types} || false
228228 ${CABAL} -vnormal check
229− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
230− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
229+ cd ${PKGDIR_uuid} || false
230+ ${CABAL} -vnormal check
231231 - name: haddock
232232 run: |
233233 $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all