on master help sign in
Add GHC-9.4 and 9.2 CI jobs for uuid
34f5786Oleg Grenrus
.github/workflows/haskell-ci-bench.yml+17−2
@@ -8,9 +8,9 @@
8#
8#
9# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
10#
10#
11−# version: 0.15.20220808
11+# version: 0.15.20220826
12#
12#
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"])
14#
14#
15name: Benchmarks
15name: Benchmarks
16on:
16on:
@@ -32,6 +32,21 @@ jobs:
32 strategy:
32 strategy:
33 matrix:
33 matrix:
34 include:
34 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
35 - compiler: ghc-8.10.7
50 - compiler: ghc-8.10.7
36 compilerKind: ghc
51 compilerKind: ghc
37 compilerVersion: 8.10.7
52 compilerVersion: 8.10.7
.github/workflows/haskell-ci.yml+10−10
@@ -8,9 +8,9 @@
8#
8#
9# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
10#
10#
11−# version: 0.15.20220808
11+# version: 0.15.20220826
12#
12#
13−# REGENDATA ("0.15.20220808",["github","cabal.project"])
13+# REGENDATA ("0.15.20220826",["github","cabal.project"])
14#
14#
15name: Haskell-CI
15name: Haskell-CI
16on:
16on:
@@ -32,9 +32,9 @@ jobs:
32 strategy:
32 strategy:
33 matrix:
33 matrix:
34 include:
34 include:
35− - compiler: ghc-9.4.1
35+ - compiler: ghc-9.4.2
36 compilerKind: ghc
36 compilerKind: ghc
37− compilerVersion: 9.4.1
37+ compilerVersion: 9.4.2
38 setup-method: ghcup
38 setup-method: ghcup
39 allow-failure: false
39 allow-failure: false
40 - compiler: ghc-9.2.4
40 - compiler: ghc-9.2.4
@@ -206,7 +206,7 @@ jobs:
206 run: |
206 run: |
207 touch cabal.project
207 touch cabal.project
208 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
208 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
210 cat cabal.project
210 cat cabal.project
211 - name: sdist
211 - name: sdist
212 run: |
212 run: |
@@ -226,11 +226,11 @@ jobs:
226 touch cabal.project
226 touch cabal.project
227 touch cabal.project.local
227 touch cabal.project.local
228 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
228 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
230 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
230 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
231 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
231 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
232+ if [ $((HCNUMVER >= 80200)) -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
233+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
234 cat >> cabal.project <<EOF
234 cat >> cabal.project <<EOF
235 EOF
235 EOF
236 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
236 $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:
263 run: |
263 run: |
264 cd ${PKGDIR_uuid_types} || false
264 cd ${PKGDIR_uuid_types} || false
265 ${CABAL} -vnormal check
265 ${CABAL} -vnormal check
266− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
266+ cd ${PKGDIR_uuid} || false
267− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
267+ ${CABAL} -vnormal check
268 - name: haddock
268 - name: haddock
269 run: |
269 run: |
270 $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
270 $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
14
14
15-- Benchmarking with older GHCs is not meaningful
15-- Benchmarking with older GHCs is not meaningful
16tested-with:
16tested-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
18
26
19synopsis: UUID benchmarks
27synopsis: UUID benchmarks
20description:
28description:
@@ -39,12 +47,12 @@ library
39 , cryptohash-sha1 >=0.11.100 && <0.12
47 , cryptohash-sha1 >=0.11.100 && <0.12
40 , deepseq >=1.3.0.0 && <1.5
48 , deepseq >=1.3.0.0 && <1.5
41 , entropy >=0.3.7 && <0.5
49 , entropy >=0.3.7 && <0.5
42− , hashable >=1.2.7.0 && <1.4
50+ , hashable >=1.2.7.0 && <1.5
43 , network-info >=0.2 && <0.3
51 , network-info >=0.2 && <0.3
44 , random >=1.1 && <1.3
52 , random >=1.1 && <1.3
45 , template-haskell >=2.7.0.0 && <2.20
53 , template-haskell >=2.7.0.0 && <2.20
46− , text >=1.2.3.0 && <1.3
54+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
47− , time >=1.4 && <1.12
55+ , time >=1.4 && <1.13
48
56
49 -- uuid modules
57 -- uuid modules
50 exposed-modules:
58 exposed-modules:
@@ -93,7 +101,7 @@ benchmark uuid-types-benchmark
93 -- deps w/o inherited constraints
101 -- deps w/o inherited constraints
94 build-depends:
102 build-depends:
95 containers >=0.5 && <0.7
103 containers >=0.5 && <0.7
96− , criterion >=1.5 && <1.6
104+ , criterion >=1.5 && <1.7
97 , unordered-containers >=0.2.7 && <0.3
105 , unordered-containers >=0.2.7 && <0.3
98
106
99benchmark uuid-benchmark
107benchmark uuid-benchmark
@@ -115,5 +123,5 @@ benchmark uuid-benchmark
115
123
116 -- deps w/o inherited constraints
124 -- deps w/o inherited constraints
117 build-depends:
125 build-depends:
118− criterion >=1.5 && <1.6
126+ criterion >=1.5 && <1.7
119 , mersenne-random-pure64 >=0.2 && <0.3
127 , mersenne-random-pure64 >=0.2 && <0.3
uuid-types/uuid-types.cabal+1−1
@@ -25,7 +25,7 @@ tested-with:
25 || ==8.10.7
25 || ==8.10.7
26 || ==9.0.2
26 || ==9.0.2
27 || ==9.2.4
27 || ==9.2.4
28− || ==9.4.1
28+ || ==9.4.2
29
29
30synopsis: Type definitions for Universally Unique Identifiers
30synopsis: Type definitions for Universally Unique Identifiers
31description:
31description:
uuid/uuid.cabal+4−2
@@ -1,7 +1,7 @@
1cabal-version: 1.12
1cabal-version: 1.12
2name: uuid
2name: uuid
3version: 1.3.15
3version: 1.3.15
4−x-revision: 1
4+x-revision: 2
5copyright: (c) 2008-2014 Antoine Latter
5copyright: (c) 2008-2014 Antoine Latter
6author: Antoine Latter
6author: Antoine Latter
7maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
7maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -21,6 +21,8 @@ tested-with:
21 || ==8.8.4
21 || ==8.8.4
22 || ==8.10.7
22 || ==8.10.7
23 || ==9.0.2
23 || ==9.0.2
24+ || ==9.2.4
25+ || ==9.4.2
24
26
25synopsis:
27synopsis:
26 For creating, comparing, parsing and printing Universally Unique Identifiers
28 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -51,7 +53,7 @@ library
51 , network-info >=0.2 && <0.3
53 , network-info >=0.2 && <0.3
52 , random >=1.1 && <1.3
54 , random >=1.1 && <1.3
53 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
55 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
54− , time >=1.4 && <1.12
56+ , time >=1.4 && <1.13
55
57
56 -- strict dependency on uuid-types,
58 -- strict dependency on uuid-types,
57 -- as we re-rexport datatype, thus leak instances etc.
59 -- as we re-rexport datatype, thus leak instances etc.