Skip to content

Commit 4efb64e

Browse files
committed
any
1 parent 1c2aa8c commit 4efb64e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 6 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.19.20240513
11+
# version: 0.19.20240708
1212
#
13-
# REGENDATA ("0.19.20240513",["github","postgresql-libpq.cabal"])
13+
# REGENDATA ("0.19.20240708",["github","postgresql-libpq.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -90,10 +90,10 @@ jobs:
9090
apt-get update
9191
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9292
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
93+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
9494
chmod a+x "$HOME/.ghcup/bin/ghcup"
9595
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9797
env:
9898
HCKIND: ${{ matrix.compilerKind }}
9999
HCNAME: ${{ matrix.compiler }}
@@ -111,7 +111,7 @@ jobs:
111111
echo "HC=$HC" >> "$GITHUB_ENV"
112112
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113113
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115115
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
116116
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
117117
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -196,7 +196,7 @@ jobs:
196196
echo " ghc-options: -Werror=missing-methods" >> cabal.project
197197
cat >> cabal.project <<EOF
198198
EOF
199-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(postgresql-libpq)$/; }' >> cabal.project.local
199+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq)$/; }' >> cabal.project.local
200200
cat cabal.project
201201
cat cabal.project.local
202202
- name: dump install plan

.github/workflows/simple.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
os: [macos-latest, windows-latest]
1717
# Older GHCs need LLVM on macos-latest (ARM)
18-
ghc: ['9.2','9.4.8','9.6.5','9.8.2']
18+
ghc: ['9.2','9.4.8','9.6.6','9.8.2','9.10.1']
1919
fail-fast: false
2020
timeout-minutes:
2121
60

0 commit comments

Comments
 (0)