on master help sign in
Support GHC-9.12
commit99fbbfd4c68a743c0816ad6e9ca1a73ce045198f authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 3 Jan 2025, 12:59 (2 years ago) parent68d7fe2
3 files changed+35−23
.github/workflows/haskell-ci.yml+27−17 uuid-types/uuid-types.cabal+4−3 uuid/uuid.cabal+4−3
.github/workflows/haskell-ci.yml+27−17
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.19.20240702
11+# version: 0.19.20241223
1212#
13−# REGENDATA ("0.19.20240702",["github","cabal.project"])
13+# REGENDATA ("0.19.20241223",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -32,14 +32,19 @@ jobs:
3232 strategy:
3333 matrix:
3434 include:
35+ - compiler: ghc-9.12.1
36+ compilerKind: ghc
37+ compilerVersion: 9.12.1
38+ setup-method: ghcup
39+ allow-failure: false
3540 - compiler: ghc-9.10.1
3641 compilerKind: ghc
3742 compilerVersion: 9.10.1
3843 setup-method: ghcup
3944 allow-failure: false
40− - compiler: ghc-9.8.2
45+ - compiler: ghc-9.8.4
4146 compilerKind: ghc
42− compilerVersion: 9.8.2
47+ compilerVersion: 9.8.4
4348 setup-method: ghcup
4449 allow-failure: false
4550 - compiler: ghc-9.6.6
@@ -79,15 +84,29 @@ jobs:
7984 allow-failure: false
8085 fail-fast: false
8186 steps:
82− - name: apt
87+ - name: apt-get install
8388 run: |
8489 apt-get update
8590 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
91+ - name: Install GHCup
92+ run: |
8693 mkdir -p "$HOME/.ghcup/bin"
87− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94+ curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8895 chmod a+x "$HOME/.ghcup/bin/ghcup"
96+ - name: Install cabal-install
97+ run: |
98+ "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100+ - name: Install GHC (GHCup)
101+ if: matrix.setup-method == 'ghcup'
102+ run: |
89103 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90− "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
104+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
105+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
106+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
107+ echo "HC=$HC" >> "$GITHUB_ENV"
108+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
109+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
91110 env:
92111 HCKIND: ${{ matrix.compilerKind }}
93112 HCNAME: ${{ matrix.compiler }}
@@ -98,21 +117,12 @@ jobs:
98117 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
99118 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100119 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101− HCDIR=/opt/$HCKIND/$HCVER
102− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
103− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
104− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
105− echo "HC=$HC" >> "$GITHUB_ENV"
106− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
108− echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109120 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110121 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111122 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112123 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
113124 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
114125 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
115− echo "GHCJSARITH=0" >> "$GITHUB_ENV"
116126 env:
117127 HCKIND: ${{ matrix.compilerKind }}
118128 HCNAME: ${{ matrix.compiler }}
@@ -245,8 +255,8 @@ jobs:
245255 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
246256 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
247257 - name: save cache
248− uses: actions/cache/save@v4
249258 if: always()
259+ uses: actions/cache/save@v4
250260 with:
251261 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
252262 path: ~/.cabal/store
uuid-types/uuid-types.cabal+4−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: uuid-types
33version: 1.0.6
4−x-revision: 1
4+x-revision: 2
55copyright:
66 (c) 2017-2018 Herbert Valerio Riedel
77 (c) 2008-2014 Antoine Latter
@@ -20,8 +20,9 @@ tested-with:
2020 || ==9.2.8
2121 || ==9.4.8
2222 || ==9.6.6
23− || ==9.8.2
23+ || ==9.8.4
2424 || ==9.10.1
25+ || ==9.12.1
2526
2627synopsis: Type definitions for Universally Unique Identifiers
2728description:
@@ -51,7 +52,7 @@ library
5152 , deepseq >=1.4.4.0 && <1.6
5253 , hashable >=1.4.4.0 && <1.6
5354 , random >=1.2.1.2 && <1.3
54− , template-haskell >=2.14.0.0 && <2.23
55+ , template-haskell >=2.14.0.0 && <2.24
5556 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
5657
5758 exposed-modules: Data.UUID.Types
uuid/uuid.cabal+4−3
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: uuid
33version: 1.3.16
4−x-revision: 1
4+x-revision: 2
55copyright: (c) 2008-2014 Antoine Latter
66author: Antoine Latter
77maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -17,8 +17,9 @@ tested-with:
1717 || ==9.2.8
1818 || ==9.4.8
1919 || ==9.6.6
20− || ==9.8.2
20+ || ==9.8.4
2121 || ==9.10.1
22+ || ==9.12.1
2223
2324synopsis:
2425 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -49,7 +50,7 @@ library
4950 , network-info >=0.2 && <0.3
5051 , random >=1.2.1.2 && <1.3
5152 , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
52− , time >=1.4 && <1.13
53+ , time >=1.4 && <1.15
5354
5455 -- strict dependency on uuid-types,
5556 -- as we re-rexport datatype, thus leak instances etc.