Skip to content

Commit 0541749

Browse files
phadejphadej
authored
Merge pull request #53 from haskellari/ghc-9.8
GHC-9.8 support
2 parents a40b22a + 8541890 commit 0541749

File tree

3 files changed

+39
-24
lines changed

3 files changed

+39
-24
lines changed

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

Lines changed: 26 additions & 19 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.15.20230321
11+
# version: 0.17.20231110
1212
#
13-
# REGENDATA ("0.15.20230321",["github","postgresql-libpq.cabal"])
13+
# REGENDATA ("0.17.20231110",["github","postgresql-libpq.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -38,19 +38,24 @@ jobs:
3838
strategy:
3939
matrix:
4040
include:
41-
- compiler: ghc-9.6.1
41+
- compiler: ghc-9.8.1
4242
compilerKind: ghc
43-
compilerVersion: 9.6.1
43+
compilerVersion: 9.8.1
4444
setup-method: ghcup
4545
allow-failure: false
46-
- compiler: ghc-9.4.4
46+
- compiler: ghc-9.6.3
4747
compilerKind: ghc
48-
compilerVersion: 9.4.4
48+
compilerVersion: 9.6.3
4949
setup-method: ghcup
5050
allow-failure: false
51-
- compiler: ghc-9.2.7
51+
- compiler: ghc-9.4.8
5252
compilerKind: ghc
53-
compilerVersion: 9.2.7
53+
compilerVersion: 9.4.8
54+
setup-method: ghcup
55+
allow-failure: false
56+
- compiler: ghc-9.2.8
57+
compilerKind: ghc
58+
compilerVersion: 9.2.8
5459
setup-method: ghcup
5560
allow-failure: false
5661
- compiler: ghc-9.0.2
@@ -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))')
@@ -168,8 +175,8 @@ jobs:
168175
- name: install cabal-plan
169176
run: |
170177
mkdir -p $HOME/.cabal/bin
171-
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
172-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
178+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz
179+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
173180
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
174181
rm -f cabal-plan.xz
175182
chmod a+x $HOME/.cabal/bin/cabal-plan

‎.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.4','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-libpq.cabal‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: 2.4
22
name: postgresql-libpq
33
version: 0.10.0.0
4+
x-revision: 1
45
synopsis: low-level binding to libpq
56
description:
67
This is a binding to libpq: the C application
@@ -24,7 +25,14 @@ category: Database
2425
build-type: Custom
2526
extra-source-files: cbits/hs-libpq.h
2627
tested-with:
27-
GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.4 || ==9.6.1
28+
GHC ==8.6.5
29+
|| ==8.8.4
30+
|| ==8.10.7
31+
|| ==9.0.2
32+
|| ==9.2.8
33+
|| ==9.4.8
34+
|| ==9.6.3
35+
|| ==9.8.1
2836

2937
extra-source-files: CHANGELOG.md
3038

@@ -67,8 +75,8 @@ library
6775
Database.PostgreSQL.LibPQ.Oid
6876

6977
build-depends:
70-
, base >=4.12.0.0 && <4.19
71-
, bytestring >=0.10.8.2 && <0.12
78+
, base >=4.12.0.0 && <4.20
79+
, bytestring >=0.10.8.2 && <0.13
7280

7381
if !os(windows)
7482
build-depends: unix >=2.7.2.2 && <2.9

0 commit comments

Comments
 (0)