Skip to content

Commit 0b4e0ea

Browse files
committed
Bump GHC 9.2 version to 9.2.4
1 parent 7441ca8 commit 0b4e0ea

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 11 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,9 +38,9 @@ jobs:
3838
strategy:
3939
matrix:
4040
include:
41-
- compiler: ghc-9.2.1
41+
- compiler: ghc-9.2.4
4242
compilerKind: ghc
43-
compilerVersion: 9.2.1
43+
compilerVersion: 9.2.4
4444
setup-method: ghcup
4545
allow-failure: false
4646
- compiler: ghc-9.0.1
@@ -116,18 +116,18 @@ jobs:
116116
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
117117
if [ "${{ matrix.setup-method }}" = ghcup ]; then
118118
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"
119+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
120120
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
121+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
122+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123123
else
124124
apt-add-repository -y 'ppa:hvr/ghc'
125125
apt-get update
126126
apt-get install -y "$HCNAME"
127127
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"
128+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
129129
chmod a+x "$HOME/.ghcup/bin/ghcup"
130-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
130+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
131131
fi
132132
env:
133133
HCKIND: ${{ matrix.compilerKind }}
@@ -270,7 +270,7 @@ jobs:
270270
${CABAL} -vnormal check
271271
- name: haddock
272272
run: |
273-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
273+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
274274
- name: unconstrained build
275275
run: |
276276
rm -f cabal.project.local

postgresql-libpq.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ tested-with:
3838
|| ==8.8.4
3939
|| ==8.10.7
4040
|| ==9.0.1
41-
|| ==9.2.1
41+
|| ==9.2.4
4242

4343
extra-source-files: CHANGELOG.md
4444

0 commit comments

Comments
 (0)