git.iko.soy/typeable/uuid
on master help sign in
GHC-9.10 support (uuid)
27eedf0Oleg Grenrus
.github/workflows/haskell-ci-bench.yml+11−6
compare with master
unifiedsplit
@@ -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.19.20240514
11+# version: 0.19.20240702
12#
12#
13−# REGENDATA ("0.19.20240514",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.19.20240702",["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,14 +32,19 @@ jobs:
32 strategy:
32 strategy:
33 matrix:
33 matrix:
34 include:
34 include:
35+ - compiler: ghc-9.10.1
36+ compilerKind: ghc
37+ compilerVersion: 9.10.1
38+ setup-method: ghcup
39+ allow-failure: false
35 - compiler: ghc-9.8.2
40 - compiler: ghc-9.8.2
36 compilerKind: ghc
41 compilerKind: ghc
37 compilerVersion: 9.8.2
42 compilerVersion: 9.8.2
38 setup-method: ghcup
43 setup-method: ghcup
39 allow-failure: false
44 allow-failure: false
40− - compiler: ghc-9.6.4
45+ - compiler: ghc-9.6.6
41 compilerKind: ghc
46 compilerKind: ghc
42− compilerVersion: 9.6.4
47+ compilerVersion: 9.6.6
43 setup-method: ghcup
48 setup-method: ghcup
44 allow-failure: false
49 allow-failure: false
45 - compiler: ghc-9.4.8
50 - compiler: ghc-9.4.8
@@ -82,7 +87,7 @@ jobs:
82 curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
87 curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
83 chmod a+x "$HOME/.ghcup/bin/ghcup"
88 chmod a+x "$HOME/.ghcup/bin/ghcup"
84 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
89 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
85− "$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)
86 env:
91 env:
87 HCKIND: ${{ matrix.compilerKind }}
92 HCKIND: ${{ matrix.compilerKind }}
88 HCNAME: ${{ matrix.compiler }}
93 HCNAME: ${{ matrix.compiler }}
@@ -100,7 +105,7 @@ jobs:
100 echo "HC=$HC" >> "$GITHUB_ENV"
105 echo "HC=$HC" >> "$GITHUB_ENV"
101 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
106 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
102 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
107 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
103− 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"
104 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
105 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
106 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
.github/workflows/haskell-ci.yml+12−12
@@ -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.19.20240514
11+# version: 0.19.20240702
12#
12#
13−# REGENDATA ("0.19.20240514",["github","cabal.project"])
13+# REGENDATA ("0.19.20240702",["github","cabal.project"])
14#
14#
15name: Haskell-CI
15name: Haskell-CI
16on:
16on:
@@ -42,9 +42,9 @@ jobs:
42 compilerVersion: 9.8.2
42 compilerVersion: 9.8.2
43 setup-method: ghcup
43 setup-method: ghcup
44 allow-failure: false
44 allow-failure: false
45− - compiler: ghc-9.6.5
45+ - compiler: ghc-9.6.6
46 compilerKind: ghc
46 compilerKind: ghc
47− compilerVersion: 9.6.5
47+ compilerVersion: 9.6.6
48 setup-method: ghcup
48 setup-method: ghcup
49 allow-failure: false
49 allow-failure: false
50 - compiler: ghc-9.4.8
50 - compiler: ghc-9.4.8
@@ -87,7 +87,7 @@ jobs:
87 curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
87 curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
88 chmod a+x "$HOME/.ghcup/bin/ghcup"
88 chmod a+x "$HOME/.ghcup/bin/ghcup"
89 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
89 "$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)
91 env:
91 env:
92 HCKIND: ${{ matrix.compilerKind }}
92 HCKIND: ${{ matrix.compilerKind }}
93 HCNAME: ${{ matrix.compiler }}
93 HCNAME: ${{ matrix.compiler }}
@@ -105,7 +105,7 @@ jobs:
105 echo "HC=$HC" >> "$GITHUB_ENV"
105 echo "HC=$HC" >> "$GITHUB_ENV"
106 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
106 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
107 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"
109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -169,7 +169,7 @@ jobs:
169 run: |
169 run: |
170 touch cabal.project
170 touch cabal.project
171 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
171 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
173 cat cabal.project
173 cat cabal.project
174 - name: sdist
174 - name: sdist
175 run: |
175 run: |
@@ -189,11 +189,11 @@ jobs:
189 touch cabal.project
189 touch cabal.project
190 touch cabal.project.local
190 touch cabal.project.local
191 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
191 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
193 echo "package uuid-types" >> cabal.project
193 echo "package uuid-types" >> cabal.project
194 echo " ghc-options: -Werror=missing-methods" >> cabal.project
194 echo " ghc-options: -Werror=missing-methods" >> cabal.project
195− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
195+ echo "package uuid" >> cabal.project
196− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
196+ echo " ghc-options: -Werror=missing-methods" >> cabal.project
197 cat >> cabal.project <<EOF
197 cat >> cabal.project <<EOF
198 EOF
198 EOF
199 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
199 $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:
226 run: |
226 run: |
227 cd ${PKGDIR_uuid_types} || false
227 cd ${PKGDIR_uuid_types} || false
228 ${CABAL} -vnormal check
228 ${CABAL} -vnormal check
229− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
229+ cd ${PKGDIR_uuid} || false
230− if [ $((HCNUMVER < 91000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
230+ ${CABAL} -vnormal check
231 - name: haddock
231 - name: haddock
232 run: |
232 run: |
233 $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
233 $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
cabal.haskell-ci+1−1
@@ -1,5 +1,5 @@
1branches: master
1branches: master
2−jobs-selection: any
2+-- jobs-selection: any
3head-hackage: False
3head-hackage: False
4
4
5constraint-set random-1.2
5constraint-set random-1.2
uuid-bench/uuid-bench.cabal+5−4
@@ -20,8 +20,9 @@ tested-with:
20 || ==9.0.2
20 || ==9.0.2
21 || ==9.2.8
21 || ==9.2.8
22 || ==9.4.8
22 || ==9.4.8
23− || ==9.6.4
23+ || ==9.6.6
24 || ==9.8.2
24 || ==9.8.2
25+ || ==9.10.1
25
26
26synopsis: UUID benchmarks
27synopsis: UUID benchmarks
27description:
28description:
@@ -49,7 +50,7 @@ library
49 , hashable >=1.4.4.0 && <1.5
50 , hashable >=1.4.4.0 && <1.5
50 , network-info >=0.2 && <0.3
51 , network-info >=0.2 && <0.3
51 , random >=1.2.1.2 && <1.3
52 , random >=1.2.1.2 && <1.3
52− , template-haskell >=2.14.0.0 && <2.22
53+ , template-haskell >=2.14.0.0 && <2.23
53 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
54 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
54 , time >=1.4 && <1.13
55 , time >=1.4 && <1.13
55
56
@@ -99,7 +100,7 @@ benchmark uuid-types-benchmark
99
100
100 -- deps w/o inherited constraints
101 -- deps w/o inherited constraints
101 build-depends:
102 build-depends:
102− containers >=0.5 && <0.7
103+ containers >=0.5 && <0.8
103 , criterion >=1.5 && <1.7
104 , criterion >=1.5 && <1.7
104 , unordered-containers >=0.2.7 && <0.3
105 , unordered-containers >=0.2.7 && <0.3
105
106
@@ -118,7 +119,7 @@ benchmark uuid-benchmark
118 build-depends:
119 build-depends:
119 base
120 base
120 , random
121 , random
121− , uuid
122+ , uuid-bench
122
123
123 -- deps w/o inherited constraints
124 -- deps w/o inherited constraints
124 build-depends:
125 build-depends:
uuid-types/uuid-types.cabal+1−1
@@ -18,7 +18,7 @@ tested-with:
18 || ==9.0.2
18 || ==9.0.2
19 || ==9.2.8
19 || ==9.2.8
20 || ==9.4.8
20 || ==9.4.8
21− || ==9.6.5
21+ || ==9.6.6
22 || ==9.8.2
22 || ==9.8.2
23 || ==9.10.1
23 || ==9.10.1
24
24
uuid/uuid.cabal+2−1
@@ -15,8 +15,9 @@ tested-with:
15 || ==9.0.2
15 || ==9.0.2
16 || ==9.2.8
16 || ==9.2.8
17 || ==9.4.8
17 || ==9.4.8
18− || ==9.6.5
18+ || ==9.6.6
19 || ==9.8.2
19 || ==9.8.2
20+ || ==9.10.1
20
21
21synopsis:
22synopsis:
22 For creating, comparing, parsing and printing Universally Unique Identifiers
23 For creating, comparing, parsing and printing Universally Unique Identifiers