Skip to content

Commit e759229

Browse files
committed
Support GHC-9.4
1 parent cc891cf commit e759229

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 19 additions & 14 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.13.20211111
11+
# version: 0.15.20220826
1212
#
13-
# REGENDATA ("0.13.20211111",["github","postgresql-libpq.cabal"])
13+
# REGENDATA ("0.15.20220826",["github","postgresql-libpq.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-20.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -38,15 +38,20 @@ jobs:
3838
strategy:
3939
matrix:
4040
include:
41-
- compiler: ghc-9.2.1
41+
- compiler: ghc-9.4.2
4242
compilerKind: ghc
43-
compilerVersion: 9.2.1
43+
compilerVersion: 9.4.2
4444
setup-method: ghcup
4545
allow-failure: false
46-
- compiler: ghc-9.0.1
46+
- compiler: ghc-9.2.4
4747
compilerKind: ghc
48-
compilerVersion: 9.0.1
49-
setup-method: hvr-ppa
48+
compilerVersion: 9.2.4
49+
setup-method: ghcup
50+
allow-failure: false
51+
- compiler: ghc-9.0.2
52+
compilerKind: ghc
53+
compilerVersion: 9.0.2
54+
setup-method: ghcup
5055
allow-failure: false
5156
- compiler: ghc-8.10.7
5257
compilerKind: ghc
@@ -116,18 +121,18 @@ jobs:
116121
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
117122
if [ "${{ matrix.setup-method }}" = ghcup ]; then
118123
mkdir -p "$HOME/.ghcup/bin"
119-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
124+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
120125
chmod a+x "$HOME/.ghcup/bin/ghcup"
121-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
122-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
126+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
127+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123128
else
124129
apt-add-repository -y 'ppa:hvr/ghc'
125130
apt-get update
126131
apt-get install -y "$HCNAME"
127132
mkdir -p "$HOME/.ghcup/bin"
128-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
133+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
129134
chmod a+x "$HOME/.ghcup/bin/ghcup"
130-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
135+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
131136
fi
132137
env:
133138
HCKIND: ${{ matrix.compilerKind }}
@@ -270,7 +275,7 @@ jobs:
270275
${CABAL} -vnormal check
271276
- name: haddock
272277
run: |
273-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
278+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
274279
- name: unconstrained build
275280
run: |
276281
rm -f cabal.project.local

.github/workflows/simple.yml

Lines changed: 1 addition & 1 deletion
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.1']
17+
ghc: ['8.10','9.0','9.2','9.4.2']
1818
fail-fast: false
1919
timeout-minutes:
2020
60

postgresql-libpq.cabal

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: postgresql-libpq
22
version: 0.9.4.3
3-
x-revision: 2
3+
x-revision: 3
44
synopsis: low-level binding to libpq
55
description:
66
This is a binding to libpq: the C application
@@ -37,15 +37,16 @@ tested-with:
3737
|| ==8.6.5
3838
|| ==8.8.4
3939
|| ==8.10.7
40-
|| ==9.0.1
41-
|| ==9.2.1
40+
|| ==9.0.2
41+
|| ==9.2.4
42+
|| ==9.4.2
4243

4344
extra-source-files: CHANGELOG.md
4445

4546
custom-setup
4647
setup-depends:
4748
base >=4.3 && <5
48-
, Cabal >=1.10 && <3.7
49+
, Cabal >=1.10 && <3.9
4950

5051
-- If true, use pkg-config, otherwise use the pg_config based build
5152
-- configuration
@@ -64,14 +65,14 @@ library
6465

6566
other-modules: Database.PostgreSQL.LibPQ.Compat
6667
build-depends:
67-
base >=4.3 && <4.17
68+
base >=4.3 && <4.18
6869
, bytestring >=0.9.1.0 && <0.12
6970

7071
if !os(windows)
7172
build-depends: unix >=2.4.2.0 && <2.8
7273

7374
if os(windows)
74-
build-depends: Win32 >=2.2.0.2 && <2.11
75+
build-depends: Win32 >=2.2.0.2 && <2.14
7576

7677
ghc-options: -Wall
7778

0 commit comments

Comments
 (0)