Skip to content

Commit aa49fe6

Browse files
phadejphadej
committed
Allow base-4.18 and th-2.20
1 parent 9d3eab5 commit aa49fe6

2 files changed

Lines changed: 35 additions & 22 deletions

File tree

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

Lines changed: 29 additions & 18 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.20221009
11+
# version: 0.16
1212
#
13-
# REGENDATA ("0.15.20221009",["github","cabal.project"])
13+
# REGENDATA ("0.16",["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.4.2
41+
- compiler: ghc-9.6.1
4242
compilerKind: ghc
43-
compilerVersion: 9.4.2
43+
compilerVersion: 9.6.1
4444
setup-method: ghcup
4545
allow-failure: false
46-
- compiler: ghc-9.2.4
46+
- compiler: ghc-9.4.4
4747
compilerKind: ghc
48-
compilerVersion: 9.2.4
48+
compilerVersion: 9.4.4
49+
setup-method: ghcup
50+
allow-failure: false
51+
- compiler: ghc-9.2.7
52+
compilerKind: ghc
53+
compilerVersion: 9.2.7
4954
setup-method: ghcup
5055
allow-failure: false
5156
- compiler: ghc-9.0.2
@@ -106,18 +111,18 @@ jobs:
106111
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
107112
if [ "${{ matrix.setup-method }}" = ghcup ]; then
108113
mkdir -p "$HOME/.ghcup/bin"
109-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
114+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
110115
chmod a+x "$HOME/.ghcup/bin/ghcup"
111116
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
112-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
113118
else
114119
apt-add-repository -y 'ppa:hvr/ghc'
115120
apt-get update
116121
apt-get install -y "$HCNAME"
117122
mkdir -p "$HOME/.ghcup/bin"
118-
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
123+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
119124
chmod a+x "$HOME/.ghcup/bin/ghcup"
120-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
125+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
121126
fi
122127
env:
123128
HCKIND: ${{ matrix.compilerKind }}
@@ -135,13 +140,13 @@ jobs:
135140
echo "HC=$HC" >> "$GITHUB_ENV"
136141
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
137142
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
138-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
139144
else
140145
HC=$HCDIR/bin/$HCKIND
141146
echo "HC=$HC" >> "$GITHUB_ENV"
142147
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
143148
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
144-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
149+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
145150
fi
146151
147152
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -193,14 +198,14 @@ jobs:
193198
- name: install cabal-plan
194199
run: |
195200
mkdir -p $HOME/.cabal/bin
196-
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
197-
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
201+
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
202+
echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
198203
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
199204
rm -f cabal-plan.xz
200205
chmod a+x $HOME/.cabal/bin/cabal-plan
201206
cabal-plan --version
202207
- name: checkout
203-
uses: actions/checkout@v2
208+
uses: actions/checkout@v3
204209
with:
205210
path: source
206211
- name: initial cabal.project for sdist
@@ -236,8 +241,8 @@ jobs:
236241
run: |
237242
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
238243
cabal-plan
239-
- name: cache
240-
uses: actions/cache@v2
244+
- name: restore cache
245+
uses: actions/cache/restore@v3
241246
with:
242247
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
243248
path: ~/.cabal/store
@@ -261,8 +266,14 @@ jobs:
261266
${CABAL} -vnormal check
262267
- name: haddock
263268
run: |
264-
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
269+
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
265270
- name: unconstrained build
266271
run: |
267272
rm -f cabal.project.local
268273
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
274+
- name: save cache
275+
uses: actions/cache/save@v3
276+
if: always()
277+
with:
278+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
279+
path: ~/.cabal/store

‎postgresql-simple.cabal‎

Lines changed: 6 additions & 4 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.6.5
4+
x-revision: 1
45
synopsis: Mid-Level PostgreSQL client library
56
description:
67
Mid-Level PostgreSQL client library, forked from mysql-simple.
@@ -33,8 +34,9 @@ tested-with:
3334
|| ==8.8.4
3435
|| ==8.10.7
3536
|| ==9.0.2
36-
|| ==9.2.4
37-
|| ==9.4.2
37+
|| ==9.2.7
38+
|| ==9.4.4
39+
|| ==9.6.1
3840

3941
library
4042
default-language: Haskell2010
@@ -80,10 +82,10 @@ library
8082

8183
-- GHC bundled libs
8284
build-depends:
83-
base >=4.6.0.0 && <4.18
85+
base >=4.6.0.0 && <4.19
8486
, bytestring >=0.10.0.0 && <0.12
8587
, containers >=0.5.0.0 && <0.7
86-
, template-haskell >=2.8.0.0 && <2.20
88+
, template-haskell >=2.8.0.0 && <2.21
8789
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
8890
, time-compat >=1.9.5 && <1.12
8991
, transformers >=0.3.0.0 && <0.7

0 commit comments

Comments
 (0)