on master help sign in
Support GHC-9.8
commite0dfbff2fc713fc43c5a15f1aeef3fa2941df85d authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 4 Oct 2023, 12:16 (3 years ago) parent1016a12
5 files changed+78−51
.github/workflows/haskell-ci-bench.yml+17−9 .github/workflows/haskell-ci.yml+36−23 cabal.haskell-ci+2 uuid-types/uuid-types.cabal+15−13 uuid/uuid.cabal+8−6
.github/workflows/haskell-ci-bench.yml+17−9
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.15.20230313
11+# version: 0.17.20231004
1212#
13−# REGENDATA ("0.15.20230313",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.17.20231004",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
1414#
1515name: Benchmarks
1616on:
@@ -85,8 +85,9 @@ jobs:
8585 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8686 if [ "${{ matrix.setup-method }}" = ghcup ]; then
8787 mkdir -p "$HOME/.ghcup/bin"
88− curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
88+ curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
8989 chmod a+x "$HOME/.ghcup/bin/ghcup"
90+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9091 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
9192 "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9293 else
@@ -94,8 +95,9 @@ jobs:
9495 apt-get update
9596 apt-get install -y "$HCNAME"
9697 mkdir -p "$HOME/.ghcup/bin"
97− curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
98+ curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
9899 chmod a+x "$HOME/.ghcup/bin/ghcup"
100+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
99101 "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100102 fi
101103 env:
@@ -110,10 +112,12 @@ jobs:
110112 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
111113 HCDIR=/opt/$HCKIND/$HCVER
112114 if [ "${{ matrix.setup-method }}" = ghcup ]; then
113− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
115+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
114118 echo "HC=$HC" >> "$GITHUB_ENV"
115− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
116− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
119+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
117121 echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
118122 else
119123 HC=$HCDIR/bin/$HCKIND
@@ -172,8 +176,8 @@ jobs:
172176 - name: install cabal-plan
173177 run: |
174178 mkdir -p $HOME/.cabal/bin
175− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
176− echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
179+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
180+ echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
177181 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
178182 rm -f cabal-plan.xz
179183 chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -246,10 +250,14 @@ jobs:
246250 rm -f cabal.project.local
247251 - name: constraint set random-1.2
248252 run: |
253+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run
254+ cabal-plan topo | sort
249255 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
250256 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
251257 - name: constraint set random-1.1
252258 run: |
259+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all --dry-run
260+ cabal-plan topo | sort
253261 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all
254262 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all
255263 - name: save cache
.github/workflows/haskell-ci.yml+36−23
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.15.20230313
11+# version: 0.17.20231004
1212#
13−# REGENDATA ("0.15.20230313",["github","cabal.project"])
13+# REGENDATA ("0.17.20231004",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -32,19 +32,24 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.6.1
35+ - compiler: ghc-9.8.0.20230929
3636 compilerKind: ghc
37− compilerVersion: 9.6.1
37+ compilerVersion: 9.8.0.20230929
3838 setup-method: ghcup
3939 allow-failure: false
40− - compiler: ghc-9.4.4
40+ - compiler: ghc-9.6.3
4141 compilerKind: ghc
42− compilerVersion: 9.4.4
42+ compilerVersion: 9.6.3
4343 setup-method: ghcup
4444 allow-failure: false
45− - compiler: ghc-9.2.7
45+ - compiler: ghc-9.4.7
4646 compilerKind: ghc
47− compilerVersion: 9.2.7
47+ compilerVersion: 9.4.7
48+ setup-method: ghcup
49+ allow-failure: false
50+ - compiler: ghc-9.2.8
51+ compilerKind: ghc
52+ compilerVersion: 9.2.8
4853 setup-method: ghcup
4954 allow-failure: false
5055 - compiler: ghc-9.0.2
@@ -110,8 +115,9 @@ jobs:
110115 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
111116 if [ "${{ matrix.setup-method }}" = ghcup ]; then
112117 mkdir -p "$HOME/.ghcup/bin"
113− curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
118+ curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
114119 chmod a+x "$HOME/.ghcup/bin/ghcup"
120+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
115121 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
116122 "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117123 else
@@ -119,8 +125,9 @@ jobs:
119125 apt-get update
120126 apt-get install -y "$HCNAME"
121127 mkdir -p "$HOME/.ghcup/bin"
122− curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
128+ curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
123129 chmod a+x "$HOME/.ghcup/bin/ghcup"
130+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
124131 "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
125132 fi
126133 env:
@@ -135,10 +142,12 @@ jobs:
135142 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
136143 HCDIR=/opt/$HCKIND/$HCVER
137144 if [ "${{ matrix.setup-method }}" = ghcup ]; then
138− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
145+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
146+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
147+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
139148 echo "HC=$HC" >> "$GITHUB_ENV"
140− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
141− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
149+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
150+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
142151 echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143152 else
144153 HC=$HCDIR/bin/$HCKIND
@@ -197,8 +206,8 @@ jobs:
197206 - name: install cabal-plan
198207 run: |
199208 mkdir -p $HOME/.cabal/bin
200− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
201− echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
209+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
210+ echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
202211 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
203212 rm -f cabal-plan.xz
204213 chmod a+x $HOME/.cabal/bin/cabal-plan
@@ -211,7 +220,7 @@ jobs:
211220 run: |
212221 touch cabal.project
213222 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
214− if [ $((HCNUMVER < 90600)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project ; fi
223+ echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project
215224 cat cabal.project
216225 - name: sdist
217226 run: |
@@ -231,11 +240,11 @@ jobs:
231240 touch cabal.project
232241 touch cabal.project.local
233242 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
234− if [ $((HCNUMVER < 90600)) -ne 0 ] ; then echo "packages: ${PKGDIR_uuid}" >> cabal.project ; fi
243+ echo "packages: ${PKGDIR_uuid}" >> cabal.project
235244 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
236245 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
237− if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
238− if [ $((HCNUMVER >= 80200 && HCNUMVER < 90600)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
246+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
247+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
239248 cat >> cabal.project <<EOF
240249 EOF
241250 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
@@ -268,8 +277,8 @@ jobs:
268277 run: |
269278 cd ${PKGDIR_uuid_types} || false
270279 ${CABAL} -vnormal check
271− if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
272− if [ $((HCNUMVER < 90600)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
280+ cd ${PKGDIR_uuid} || false
281+ ${CABAL} -vnormal check
273282 - name: haddock
274283 run: |
275284 $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
@@ -282,12 +291,16 @@ jobs:
282291 rm -f cabal.project.local
283292 - name: constraint set random-1.2
284293 run: |
294+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run ; fi
295+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
285296 if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all ; fi
286297 if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all ; fi
287298 - name: constraint set random-1.1
288299 run: |
289− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all
290− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all
300+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all --dry-run ; fi
301+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
302+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all ; fi
303+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all ; fi
291304 - name: save cache
292305 uses: actions/cache/save@v3
293306 if: always()
cabal.haskell-ci+2
@@ -1,7 +1,9 @@
11branches: master
22jobs-selection: any
3+head-hackage: False
34
45constraint-set random-1.1
6+ ghc: <9.7
57 constraints: random==1.1.*
68
79constraint-set random-1.2
uuid-types/uuid-types.cabal+15−13
@@ -1,7 +1,6 @@
11cabal-version: 1.12
22name: uuid-types
3−version: 1.0.5
4−x-revision: 4
3+version: 1.0.5.1
54copyright:
65 (c) 2017-2018 Herbert Valerio Riedel
76 (c) 2008-2014 Antoine Latter
@@ -24,9 +23,10 @@ tested-with:
2423 || ==8.8.4
2524 || ==8.10.7
2625 || ==9.0.2
27− || ==9.2.7
28− || ==9.4.4
29− || ==9.6.1
26+ || ==9.2.8
27+ || ==9.4.7
28+ || ==9.6.3
29+ || ==9.8.1
3030
3131synopsis: Type definitions for Universally Unique Identifiers
3232description:
@@ -52,12 +52,12 @@ library
5252 build-depends:
5353 base >=4.5 && <5
5454 , binary >=0.5.1.0 && <0.9
55− , bytestring >=0.9.2.1 && <0.12
56− , deepseq >=1.3.0.0 && <1.5
55+ , bytestring >=0.9.2.1 && <0.13
56+ , deepseq >=1.3.0.0 && <1.6
5757 , hashable >=1.2.7.0 && <1.5
5858 , random >=1.1 && <1.3
59− , template-haskell >=2.7.0.0 && <2.21
60− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
59+ , template-haskell >=2.7.0.0 && <2.22
60+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
6161
6262 exposed-modules: Data.UUID.Types
6363
@@ -87,13 +87,15 @@ test-suite testuuid
8787 base
8888 , binary
8989 , bytestring
90− , uuid-types
9190 , template-haskell
91+ , uuid-types
9292
9393 -- deps w/o inherited constraints
9494 build-depends:
95− ghc-byteorder >=4.11 && <4.12
96− , QuickCheck >=2.14.2 && <2.15
97− , tasty >=1.4.0.1 && <1.5
95+ QuickCheck >=2.14.2 && <2.15
96+ , tasty >=1.4.0.1 && <1.6
9897 , tasty-hunit >=0.10 && <0.11
9998 , tasty-quickcheck >=0.10 && <0.11
99+
100+ if !impl(ghc >=8.4)
101+ build-depends: ghc-byteorder >=4.11 && <4.12
uuid/uuid.cabal+8−6
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: uuid
33version: 1.3.15
4−x-revision: 2
4+x-revision: 3
55copyright: (c) 2008-2014 Antoine Latter
66author: Antoine Latter
77maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -21,8 +21,10 @@ tested-with:
2121 || ==8.8.4
2222 || ==8.10.7
2323 || ==9.0.2
24− || ==9.2.7
25− || ==9.4.4
24+ || ==9.2.8
25+ || ==9.4.7
26+ || ==9.6.3
27+ || ==9.8.1
2628
2729synopsis:
2830 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -46,13 +48,13 @@ library
4648 build-depends:
4749 base >=4.5 && <5
4850 , binary >=0.5.1.0 && <0.9
49− , bytestring >=0.9.2.1 && <0.12
51+ , bytestring >=0.9.2.1 && <0.13
5052 , cryptohash-md5 >=0.11.100 && <0.12
5153 , cryptohash-sha1 >=0.11.100 && <0.12
5254 , entropy >=0.3.7 && <0.5
5355 , network-info >=0.2 && <0.3
5456 , random >=1.1 && <1.3
55− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
57+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
5658 , time >=1.4 && <1.13
5759
5860 -- strict dependency on uuid-types,
@@ -97,6 +99,6 @@ test-suite testuuid
9799 -- deps w/o inherited constraints
98100 build-depends:
99101 QuickCheck >=2.14.2 && <2.15
100− , tasty >=1.4.0.1 && <1.5
102+ , tasty >=1.4.0.1 && <1.6
101103 , tasty-hunit >=0.10 && <0.11
102104 , tasty-quickcheck >=0.10 && <0.11