git.iko.soy/typeable/uuid
on master help sign in
Support GHC-9.4 (uuid-types)
780753eOleg Grenrus
.github/workflows/haskell-ci-bench.yml+42−19
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.13.20211030
11+# version: 0.15.20220808
12#
12#
13−# REGENDATA ("0.13.20211030",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.15.20220808",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
14#
14#
15name: Benchmarks
15name: Benchmarks
16on:
16on:
@@ -23,17 +23,19 @@ on:
23jobs:
23jobs:
24 linux:
24 linux:
25 name: Benchmarks - Linux - ${{ matrix.compiler }}
25 name: Benchmarks - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-18.04
26+ runs-on: ubuntu-20.04
27+ timeout-minutes:
28+ 60
27 container:
29 container:
28 image: buildpack-deps:bionic
30 image: buildpack-deps:bionic
29 continue-on-error: ${{ matrix.allow-failure }}
31 continue-on-error: ${{ matrix.allow-failure }}
30 strategy:
32 strategy:
31 matrix:
33 matrix:
32 include:
34 include:
33− - compiler: ghc-8.10.3
35+ - compiler: ghc-8.10.7
34 compilerKind: ghc
36 compilerKind: ghc
35− compilerVersion: 8.10.3
37+ compilerVersion: 8.10.7
36− setup-method: hvr-ppa
38+ setup-method: ghcup
37 allow-failure: false
39 allow-failure: false
38 - compiler: ghc-8.8.4
40 - compiler: ghc-8.8.4
39 compilerKind: ghc
41 compilerKind: ghc
@@ -66,13 +68,21 @@ jobs:
66 run: |
68 run: |
67 apt-get update
69 apt-get update
68 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
70 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
71+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
72+ mkdir -p "$HOME/.ghcup/bin"
73+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
74+ chmod a+x "$HOME/.ghcup/bin/ghcup"
75+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
76+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
77+ else
69− apt-add-repository -y 'ppa:hvr/ghc'
78+ apt-add-repository -y 'ppa:hvr/ghc'
70− apt-get update
79+ apt-get update
71− apt-get install -y "$HCNAME"
80+ apt-get install -y "$HCNAME"
72− mkdir -p "$HOME/.ghcup/bin"
81+ mkdir -p "$HOME/.ghcup/bin"
73− curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
82+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
74− chmod a+x "$HOME/.ghcup/bin/ghcup"
83+ chmod a+x "$HOME/.ghcup/bin/ghcup"
75− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
84+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
85+ fi
76 env:
86 env:
77 HCKIND: ${{ matrix.compilerKind }}
87 HCKIND: ${{ matrix.compilerKind }}
78 HCNAME: ${{ matrix.compiler }}
88 HCNAME: ${{ matrix.compiler }}
@@ -84,11 +94,20 @@ jobs:
84 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
94 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
85 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
95 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
86 HCDIR=/opt/$HCKIND/$HCVER
96 HCDIR=/opt/$HCKIND/$HCVER
97+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
98+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
99+ echo "HC=$HC" >> "$GITHUB_ENV"
100+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
101+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
102+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
103+ else
87− HC=$HCDIR/bin/$HCKIND
104+ HC=$HCDIR/bin/$HCKIND
88− echo "HC=$HC" >> "$GITHUB_ENV"
105+ echo "HC=$HC" >> "$GITHUB_ENV"
89− echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
106+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
90− echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
107+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
91− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
108+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109+ fi
110+
92 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
111 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
93 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
112 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
94 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
113 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -122,6 +141,10 @@ jobs:
122 repository hackage.haskell.org
141 repository hackage.haskell.org
123 url: http://hackage.haskell.org/
142 url: http://hackage.haskell.org/
124 EOF
143 EOF
144+ cat >> $CABAL_CONFIG <<EOF
145+ program-default-options
146+ ghc-options: $GHCJOBS +RTS -M3G -RTS
147+ EOF
125 cat $CABAL_CONFIG
148 cat $CABAL_CONFIG
126 - name: versions
149 - name: versions
127 run: |
150 run: |
@@ -198,7 +221,7 @@ jobs:
198 ${CABAL} -vnormal check
221 ${CABAL} -vnormal check
199 - name: haddock
222 - name: haddock
200 run: |
223 run: |
201− $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
224+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
202 - name: unconstrained build
225 - name: unconstrained build
203 run: |
226 run: |
204 rm -f cabal.project.local
227 rm -f cabal.project.local
.github/workflows/haskell-ci.yml+25−14
@@ -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.13.20211030
11+# version: 0.15.20220808
12#
12#
13−# REGENDATA ("0.13.20211030",["github","cabal.project"])
13+# REGENDATA ("0.15.20220808",["github","cabal.project"])
14#
14#
15name: Haskell-CI
15name: Haskell-CI
16on:
16on:
@@ -23,22 +23,29 @@ on:
23jobs:
23jobs:
24 linux:
24 linux:
25 name: Haskell-CI - Linux - ${{ matrix.compiler }}
25 name: Haskell-CI - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-18.04
26+ runs-on: ubuntu-20.04
27+ timeout-minutes:
28+ 60
27 container:
29 container:
28 image: buildpack-deps:bionic
30 image: buildpack-deps:bionic
29 continue-on-error: ${{ matrix.allow-failure }}
31 continue-on-error: ${{ matrix.allow-failure }}
30 strategy:
32 strategy:
31 matrix:
33 matrix:
32 include:
34 include:
33− - compiler: ghc-9.2.1
35+ - compiler: ghc-9.4.1
34 compilerKind: ghc
36 compilerKind: ghc
35− compilerVersion: 9.2.1
37+ compilerVersion: 9.4.1
36 setup-method: ghcup
38 setup-method: ghcup
37 allow-failure: false
39 allow-failure: false
38− - compiler: ghc-9.0.1
40+ - compiler: ghc-9.2.4
39 compilerKind: ghc
41 compilerKind: ghc
40− compilerVersion: 9.0.1
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
41− setup-method: hvr-ppa
48+ setup-method: ghcup
42 allow-failure: false
49 allow-failure: false
43 - compiler: ghc-8.10.7
50 - compiler: ghc-8.10.7
44 compilerKind: ghc
51 compilerKind: ghc
@@ -98,18 +105,18 @@ jobs:
98 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
105 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
99 if [ "${{ matrix.setup-method }}" = ghcup ]; then
106 if [ "${{ matrix.setup-method }}" = ghcup ]; then
100 mkdir -p "$HOME/.ghcup/bin"
107 mkdir -p "$HOME/.ghcup/bin"
101− curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
108+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
102 chmod a+x "$HOME/.ghcup/bin/ghcup"
109 chmod a+x "$HOME/.ghcup/bin/ghcup"
103− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
110+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
104− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
111+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105 else
112 else
106 apt-add-repository -y 'ppa:hvr/ghc'
113 apt-add-repository -y 'ppa:hvr/ghc'
107 apt-get update
114 apt-get update
108 apt-get install -y "$HCNAME"
115 apt-get install -y "$HCNAME"
109 mkdir -p "$HOME/.ghcup/bin"
116 mkdir -p "$HOME/.ghcup/bin"
110− curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
117+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
111 chmod a+x "$HOME/.ghcup/bin/ghcup"
118 chmod a+x "$HOME/.ghcup/bin/ghcup"
112− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
119+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113 fi
120 fi
114 env:
121 env:
115 HCKIND: ${{ matrix.compilerKind }}
122 HCKIND: ${{ matrix.compilerKind }}
@@ -169,6 +176,10 @@ jobs:
169 repository hackage.haskell.org
176 repository hackage.haskell.org
170 url: http://hackage.haskell.org/
177 url: http://hackage.haskell.org/
171 EOF
178 EOF
179+ cat >> $CABAL_CONFIG <<EOF
180+ program-default-options
181+ ghc-options: $GHCJOBS +RTS -M3G -RTS
182+ EOF
172 cat $CABAL_CONFIG
183 cat $CABAL_CONFIG
173 - name: versions
184 - name: versions
174 run: |
185 run: |
@@ -256,7 +267,7 @@ jobs:
256 if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
267 if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
257 - name: haddock
268 - name: haddock
258 run: |
269 run: |
259− $CABAL v2-haddock $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
260 - name: unconstrained build
271 - name: unconstrained build
261 run: |
272 run: |
262 rm -f cabal.project.local
273 rm -f cabal.project.local
uuid-bench/uuid-bench.cabal+2−2
@@ -14,7 +14,7 @@ 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.3
17+ GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 || ==8.8.4 || ==8.10.7
18
18
19synopsis: UUID benchmarks
19synopsis: UUID benchmarks
20description:
20description:
@@ -42,7 +42,7 @@ library
42 , hashable >=1.2.7.0 && <1.4
42 , hashable >=1.2.7.0 && <1.4
43 , network-info >=0.2 && <0.3
43 , network-info >=0.2 && <0.3
44 , random >=1.1 && <1.3
44 , random >=1.1 && <1.3
45− , template-haskell >=2.7.0.0 && <2.18
45+ , template-haskell >=2.7.0.0 && <2.20
46 , text >=1.2.3.0 && <1.3
46 , text >=1.2.3.0 && <1.3
47 , time >=1.4 && <1.12
47 , time >=1.4 && <1.12
48
48
uuid-types/uuid-types.cabal+5−4
@@ -1,7 +1,7 @@
1cabal-version: 1.12
1cabal-version: 1.12
2name: uuid-types
2name: uuid-types
3version: 1.0.5
3version: 1.0.5
4−x-revision: 2
4+x-revision: 3
5copyright:
5copyright:
6 (c) 2017-2018 Herbert Valerio Riedel
6 (c) 2017-2018 Herbert Valerio Riedel
7 (c) 2008-2014 Antoine Latter
7 (c) 2008-2014 Antoine Latter
@@ -23,8 +23,9 @@ tested-with:
23 || ==8.6.4
23 || ==8.6.4
24 || ==8.8.4
24 || ==8.8.4
25 || ==8.10.7
25 || ==8.10.7
26− || ==9.0.1
26+ || ==9.0.2
27− || ==9.2.1
27+ || ==9.2.4
28+ || ==9.4.1
28
29
29synopsis: Type definitions for Universally Unique Identifiers
30synopsis: Type definitions for Universally Unique Identifiers
30description:
31description:
@@ -54,7 +55,7 @@ library
54 , deepseq >=1.3.0.0 && <1.5
55 , deepseq >=1.3.0.0 && <1.5
55 , hashable >=1.2.7.0 && <1.5
56 , hashable >=1.2.7.0 && <1.5
56 , random >=1.1 && <1.3
57 , random >=1.1 && <1.3
57− , template-haskell >=2.7.0.0 && <2.19
58+ , template-haskell >=2.7.0.0 && <2.20
58 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
59 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
59
60
60 exposed-modules: Data.UUID.Types
61 exposed-modules: Data.UUID.Types
uuid/uuid.cabal+1−1
@@ -20,7 +20,7 @@ tested-with:
20 || ==8.6.4
20 || ==8.6.4
21 || ==8.8.4
21 || ==8.8.4
22 || ==8.10.7
22 || ==8.10.7
23− || ==9.0.1
23+ || ==9.0.2
24
24
25synopsis:
25synopsis:
26 For creating, comparing, parsing and printing Universally Unique Identifiers
26 For creating, comparing, parsing and printing Universally Unique Identifiers