Skip to content

Commit 3ac2949

Browse files
phadejphadej
authored
Merge pull request #130 from haskellari/ghc-9.8
GHC-9.8 support
2 parents 6836ea6 + f5b4316 commit 3ac2949

3 files changed

Lines changed: 32 additions & 23 deletions

File tree

‎.github/workflows/haskell-ci.yml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.16.6
11+
# version: 0.17.20231110
1212
#
13-
# REGENDATA ("0.16.6",["github","cabal.project"])
13+
# REGENDATA ("0.17.20231110",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -38,14 +38,19 @@ jobs:
3838
strategy:
3939
matrix:
4040
include:
41-
- compiler: ghc-9.6.2
41+
- compiler: ghc-9.8.1
4242
compilerKind: ghc
43-
compilerVersion: 9.6.2
43+
compilerVersion: 9.8.1
4444
setup-method: ghcup
4545
allow-failure: false
46-
- compiler: ghc-9.4.5
46+
- compiler: ghc-9.6.3
4747
compilerKind: ghc
48-
compilerVersion: 9.4.5
48+
compilerVersion: 9.6.3
49+
setup-method: ghcup
50+
allow-failure: false
51+
- compiler: ghc-9.4.8
52+
compilerKind: ghc
53+
compilerVersion: 9.4.8
4954
setup-method: ghcup
5055
allow-failure: false
5156
- compiler: ghc-9.2.8
@@ -81,18 +86,18 @@ jobs:
8186
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8287
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8388
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
89+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8590
chmod a+x "$HOME/.ghcup/bin/ghcup"
8691
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
92+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8893
else
8994
apt-add-repository -y 'ppa:hvr/ghc'
9095
apt-get update
9196
apt-get install -y "$HCNAME"
9297
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$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"
9499
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96101
fi
97102
env:
98103
HCKIND: ${{ matrix.compilerKind }}
@@ -106,17 +111,19 @@ jobs:
106111
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107112
HCDIR=/opt/$HCKIND/$HCVER
108113
if [ "${{ matrix.setup-method }}" = ghcup ]; then
109-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
114+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
115+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
116+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
110117
echo "HC=$HC" >> "$GITHUB_ENV"
111-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
112-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
113-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
118+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
119+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
120+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114121
else
115122
HC=$HCDIR/bin/$HCKIND
116123
echo "HC=$HC" >> "$GITHUB_ENV"
117124
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
118125
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
119-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
126+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
120127
fi
121128
122129
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

‎.github/workflows/simple.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
os: [macos-latest, windows-latest]
17-
ghc: ['8.10','9.0','9.2','9.4.5','9.6.2']
17+
ghc: ['8.10','9.0','9.2','9.4.8','9.6.3','9.8.1']
1818
fail-fast: false
1919
timeout-minutes:
2020
60
@@ -29,7 +29,7 @@ jobs:
2929
uses: haskell/actions/setup@v2
3030
with:
3131
ghc-version: ${{ matrix.ghc }}
32-
cabal-version: '3.10.1.0'
32+
cabal-version: '3.10.2.0'
3333

3434
- name: Set up PostgreSQL
3535
uses: ikalnytskyi/action-setup-postgres@v3

‎postgresql-simple.cabal‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 1.12
22
name: postgresql-simple
33
version: 0.7.0.0
4+
x-revision: 1
45
synopsis: Mid-Level PostgreSQL client library
56
description:
67
Mid-Level PostgreSQL client library, forked from mysql-simple.
@@ -28,8 +29,9 @@ tested-with:
2829
|| ==8.10.7
2930
|| ==9.0.2
3031
|| ==9.2.8
31-
|| ==9.4.5
32-
|| ==9.6.2
32+
|| ==9.4.8
33+
|| ==9.6.3
34+
|| ==9.8.1
3335

3436
library
3537
default-language: Haskell2010
@@ -75,11 +77,11 @@ library
7577

7678
-- GHC bundled libs
7779
build-depends:
78-
base >=4.12.0.0 && <4.19
79-
, bytestring >=0.10.8.2 && <0.12
80+
base >=4.12.0.0 && <4.20
81+
, bytestring >=0.10.8.2 && <0.13
8082
, containers >=0.6.0.1 && <0.7
81-
, template-haskell >=2.14.0.0 && <2.21
82-
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
83+
, template-haskell >=2.14.0.0 && <2.22
84+
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
8385
, time-compat >=1.9.5 && <1.12
8486
, transformers >=0.5.6.2 && <0.7
8587

0 commit comments

Comments
 (0)