git.iko.soy/typeable/uuid
on master help sign in
Merge pull request #81 from haskell-hvr/ci-update

Update CI

commit0160729e3a86b36bf8ea4d12632cb7f99ec35cbe authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 16 Apr 2024, 17:48 (3 years ago) parenta1845881ad79f8
5 files changed+58−42
compare with master
unifiedsplit
.github/workflows/haskell-ci-bench.yml+28−16 .github/workflows/haskell-ci.yml+16−14 uuid-bench/uuid-bench.cabal+8−6 uuid-types/uuid-types.cabal+3−3 uuid/uuid.cabal+3−3
.github/workflows/haskell-ci-bench.yml+28−16
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.17.20231010
11+# version: 0.19.20240402
1212#
13−# REGENDATA ("0.17.20231010",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.19.20240402",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
1414#
1515name: Benchmarks
1616on:
@@ -32,14 +32,24 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.4.4
35+ - compiler: ghc-9.8.2
3636 compilerKind: ghc
37− compilerVersion: 9.4.4
37+ compilerVersion: 9.8.2
3838 setup-method: ghcup
3939 allow-failure: false
40− - compiler: ghc-9.2.7
40+ - compiler: ghc-9.6.4
4141 compilerKind: ghc
42− compilerVersion: 9.2.7
42+ compilerVersion: 9.6.4
43+ setup-method: ghcup
44+ allow-failure: false
45+ - compiler: ghc-9.4.8
46+ compilerKind: ghc
47+ compilerVersion: 9.4.8
48+ setup-method: ghcup
49+ allow-failure: false
50+ - compiler: ghc-9.2.8
51+ compilerKind: ghc
52+ compilerVersion: 9.2.8
4353 setup-method: ghcup
4454 allow-failure: false
4555 - compiler: ghc-9.0.2
@@ -85,18 +95,20 @@ jobs:
8595 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8696 if [ "${{ matrix.setup-method }}" = ghcup ]; then
8797 mkdir -p "$HOME/.ghcup/bin"
88− curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
98+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8999 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.8.yaml;
90101 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
91− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92103 else
93104 apt-add-repository -y 'ppa:hvr/ghc'
94105 apt-get update
95106 apt-get install -y "$HCNAME"
96107 mkdir -p "$HOME/.ghcup/bin"
97− curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
108+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
98109 chmod a+x "$HOME/.ghcup/bin/ghcup"
99− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
111+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100112 fi
101113 env:
102114 HCKIND: ${{ matrix.compilerKind }}
@@ -116,13 +128,13 @@ jobs:
116128 echo "HC=$HC" >> "$GITHUB_ENV"
117129 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
118130 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
119− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
131+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120132 else
121133 HC=$HCDIR/bin/$HCKIND
122134 echo "HC=$HC" >> "$GITHUB_ENV"
123135 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
124136 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
125− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126138 fi
127139
128140 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -254,10 +266,10 @@ jobs:
254266 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
255267 - name: constraint set random-1.1
256268 run: |
257− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all --dry-run
258− cabal-plan topo | sort
259− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all
260− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all
269+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all --dry-run ; fi
270+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
271+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all ; fi
272+ if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all ; fi
261273 - name: save cache
262274 uses: actions/cache/save@v3
263275 if: always()
.github/workflows/haskell-ci.yml+16−14
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.17.20231010
11+# version: 0.19.20240402
1212#
13−# REGENDATA ("0.17.20231010",["github","cabal.project"])
13+# REGENDATA ("0.19.20240402",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -32,19 +32,19 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.8.1
35+ - compiler: ghc-9.8.2
3636 compilerKind: ghc
37− compilerVersion: 9.8.1
37+ compilerVersion: 9.8.2
3838 setup-method: ghcup
3939 allow-failure: false
40− - compiler: ghc-9.6.3
40+ - compiler: ghc-9.6.4
4141 compilerKind: ghc
42− compilerVersion: 9.6.3
42+ compilerVersion: 9.6.4
4343 setup-method: ghcup
4444 allow-failure: false
45− - compiler: ghc-9.4.7
45+ - compiler: ghc-9.4.8
4646 compilerKind: ghc
47− compilerVersion: 9.4.7
47+ compilerVersion: 9.4.8
4848 setup-method: ghcup
4949 allow-failure: false
5050 - compiler: ghc-9.2.8
@@ -115,18 +115,20 @@ jobs:
115115 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
116116 if [ "${{ matrix.setup-method }}" = ghcup ]; then
117117 mkdir -p "$HOME/.ghcup/bin"
118− curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
118+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
119119 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.8.yaml;
120121 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
121− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
122+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
122123 else
123124 apt-add-repository -y 'ppa:hvr/ghc'
124125 apt-get update
125126 apt-get install -y "$HCNAME"
126127 mkdir -p "$HOME/.ghcup/bin"
127− curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
128+ curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
128129 chmod a+x "$HOME/.ghcup/bin/ghcup"
129− "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
130+ "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
131+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
130132 fi
131133 env:
132134 HCKIND: ${{ matrix.compilerKind }}
@@ -146,13 +148,13 @@ jobs:
146148 echo "HC=$HC" >> "$GITHUB_ENV"
147149 echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
148150 echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
149− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
151+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
150152 else
151153 HC=$HCDIR/bin/$HCKIND
152154 echo "HC=$HC" >> "$GITHUB_ENV"
153155 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
154156 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
155− echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
157+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
156158 fi
157159
158160 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
uuid-bench/uuid-bench.cabal+8−6
@@ -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.8
26+ || ==9.6.4
27+ || ==9.8.2
2628
2729synopsis: UUID benchmarks
2830description:
@@ -42,16 +44,16 @@ library
4244 build-depends:
4345 base >=4.9 && <5
4446 , binary >=0.5.1.0 && <0.9
45− , bytestring >=0.9.2.1 && <0.12
47+ , bytestring >=0.9.2.1 && <0.13
4648 , cryptohash-md5 >=0.11.100 && <0.12
4749 , cryptohash-sha1 >=0.11.100 && <0.12
48− , deepseq >=1.3.0.0 && <1.5
50+ , deepseq >=1.3.0.0 && <1.6
4951 , entropy >=0.3.7 && <0.5
5052 , hashable >=1.2.7.0 && <1.5
5153 , network-info >=0.2 && <0.3
5254 , random >=1.1 && <1.3
53− , template-haskell >=2.7.0.0 && <2.20
54− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
55+ , template-haskell >=2.7.0.0 && <2.22
56+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
5557 , time >=1.4 && <1.13
5658
5759 -- uuid modules
uuid-types/uuid-types.cabal+3−3
@@ -24,9 +24,9 @@ tested-with:
2424 || ==8.10.7
2525 || ==9.0.2
2626 || ==9.2.8
27− || ==9.4.7
28− || ==9.6.3
29− || ==9.8.1
27+ || ==9.4.8
28+ || ==9.6.4
29+ || ==9.8.2
3030
3131synopsis: Type definitions for Universally Unique Identifiers
3232description:
uuid/uuid.cabal+3−3
@@ -22,9 +22,9 @@ tested-with:
2222 || ==8.10.7
2323 || ==9.0.2
2424 || ==9.2.8
25− || ==9.4.7
26− || ==9.6.3
27− || ==9.8.1
25+ || ==9.4.8
26+ || ==9.6.4
27+ || ==9.8.2
2828
2929synopsis:
3030 For creating, comparing, parsing and printing Universally Unique Identifiers