git.iko.soy/typeable/uuid
on master help sign in
Add GHC-9.4 and 9.2 CI jobs for uuid
commit34f5786b5d7dceb5430f60b97680df8c3bcbbd59 authorOleg Grenrus <oleg.grenrus@iki.fi> dateSat 10 Sep 2022, 15:45 (4 years ago) parent9d83ad0
5 files changed+46−21
compare with master
unifiedsplit
.github/workflows/haskell-ci-bench.yml+17−2 .github/workflows/haskell-ci.yml+10−10 uuid-bench/uuid-bench.cabal+14−6 uuid-types/uuid-types.cabal+1−1 uuid/uuid.cabal+4−2
.github/workflows/haskell-ci-bench.yml+17−2
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.15.20220808
11+# version: 0.15.20220826
1212#
13−# REGENDATA ("0.15.20220808",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.15.20220826",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
1414#
1515name: Benchmarks
1616on:
@@ -32,6 +32,21 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35+ - compiler: ghc-9.4.2
36+ compilerKind: ghc
37+ compilerVersion: 9.4.2
38+ setup-method: ghcup
39+ allow-failure: false
40+ - compiler: ghc-9.2.4
41+ compilerKind: ghc
42+ compilerVersion: 9.2.4
43+ setup-method: ghcup
44+ allow-failure: false
45+ - compiler: ghc-9.0.2
46+ compilerKind: ghc
47+ compilerVersion: 9.0.2
48+ setup-method: ghcup
49+ allow-failure: false
3550 - compiler: ghc-8.10.7
3651 compilerKind: ghc
3752 compilerVersion: 8.10.7
.github/workflows/haskell-ci.yml+10−10
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.15.20220808
11+# version: 0.15.20220826
1212#
13−# REGENDATA ("0.15.20220808",["github","cabal.project"])
13+# REGENDATA ("0.15.20220826",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -32,9 +32,9 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.4.1
35+ - compiler: ghc-9.4.2
3636 compilerKind: ghc
37− compilerVersion: 9.4.1
37+ compilerVersion: 9.4.2
3838 setup-method: ghcup
3939 allow-failure: false
4040 - compiler: ghc-9.2.4
@@ -206,7 +206,7 @@ jobs:
206206 run: |
207207 touch cabal.project
208208 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
209− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project ; fi
209+ echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project
210210 cat cabal.project
211211 - name: sdist
212212 run: |
@@ -226,11 +226,11 @@ jobs:
226226 touch cabal.project
227227 touch cabal.project.local
228228 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
229− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: ${PKGDIR_uuid}" >> cabal.project ; fi
229+ echo "packages: ${PKGDIR_uuid}" >> cabal.project
230230 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
231231 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
232− if [ $((HCNUMVER >= 80200 && HCNUMVER < 90200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
233− if [ $((HCNUMVER >= 80200 && HCNUMVER < 90200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
232+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
233+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
234234 cat >> cabal.project <<EOF
235235 EOF
236236 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
@@ -263,8 +263,8 @@ jobs:
263263 run: |
264264 cd ${PKGDIR_uuid_types} || false
265265 ${CABAL} -vnormal check
266− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
267− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
266+ cd ${PKGDIR_uuid} || false
267+ ${CABAL} -vnormal check
268268 - name: haddock
269269 run: |
270270 $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
uuid-bench/uuid-bench.cabal+14−6
@@ -14,7 +14,15 @@ build-type: Simple
1414
1515-- Benchmarking with older GHCs is not meaningful
1616tested-with:
17− GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 || ==8.8.4 || ==8.10.7
17+ GHC ==8.0.2
18+ || ==8.2.2
19+ || ==8.4.4
20+ || ==8.6.4
21+ || ==8.8.4
22+ || ==8.10.7
23+ || ==9.0.2
24+ || ==9.2.4
25+ || ==9.4.2
1826
1927synopsis: UUID benchmarks
2028description:
@@ -39,12 +47,12 @@ library
3947 , cryptohash-sha1 >=0.11.100 && <0.12
4048 , deepseq >=1.3.0.0 && <1.5
4149 , entropy >=0.3.7 && <0.5
42− , hashable >=1.2.7.0 && <1.4
50+ , hashable >=1.2.7.0 && <1.5
4351 , network-info >=0.2 && <0.3
4452 , random >=1.1 && <1.3
4553 , template-haskell >=2.7.0.0 && <2.20
46− , text >=1.2.3.0 && <1.3
47− , time >=1.4 && <1.12
54+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
55+ , time >=1.4 && <1.13
4856
4957 -- uuid modules
5058 exposed-modules:
@@ -93,7 +101,7 @@ benchmark uuid-types-benchmark
93101 -- deps w/o inherited constraints
94102 build-depends:
95103 containers >=0.5 && <0.7
96− , criterion >=1.5 && <1.6
104+ , criterion >=1.5 && <1.7
97105 , unordered-containers >=0.2.7 && <0.3
98106
99107benchmark uuid-benchmark
@@ -115,5 +123,5 @@ benchmark uuid-benchmark
115123
116124 -- deps w/o inherited constraints
117125 build-depends:
118− criterion >=1.5 && <1.6
126+ criterion >=1.5 && <1.7
119127 , mersenne-random-pure64 >=0.2 && <0.3
uuid-types/uuid-types.cabal+1−1
@@ -25,7 +25,7 @@ tested-with:
2525 || ==8.10.7
2626 || ==9.0.2
2727 || ==9.2.4
28− || ==9.4.1
28+ || ==9.4.2
2929
3030synopsis: Type definitions for Universally Unique Identifiers
3131description:
uuid/uuid.cabal+4−2
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: uuid
33version: 1.3.15
4−x-revision: 1
4+x-revision: 2
55copyright: (c) 2008-2014 Antoine Latter
66author: Antoine Latter
77maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -21,6 +21,8 @@ tested-with:
2121 || ==8.8.4
2222 || ==8.10.7
2323 || ==9.0.2
24+ || ==9.2.4
25+ || ==9.4.2
2426
2527synopsis:
2628 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -51,7 +53,7 @@ library
5153 , network-info >=0.2 && <0.3
5254 , random >=1.1 && <1.3
5355 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
54− , time >=1.4 && <1.12
56+ , time >=1.4 && <1.13
5557
5658 -- strict dependency on uuid-types,
5759 -- as we re-rexport datatype, thus leak instances etc.