diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index c9945ff..2d39809 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
-# version: 0.19.20240708
+# version: 0.19.20241223
#
-# REGENDATA ("0.19.20240708",["github","cabal.project"])
+# REGENDATA ("0.19.20241223",["github","cabal.project"])
#
name: Haskell-CI
on:
@@ -38,19 +38,24 @@ jobs:
strategy:
matrix:
include:
+ - compiler: ghc-9.12.1
+ compilerKind: ghc
+ compilerVersion: 9.12.1
+ setup-method: ghcup
+ allow-failure: false
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- - compiler: ghc-9.8.2
+ - compiler: ghc-9.8.4
compilerKind: ghc
- compilerVersion: 9.8.2
+ compilerVersion: 9.8.4
setup-method: ghcup
allow-failure: false
- - compiler: ghc-9.6.5
+ - compiler: ghc-9.6.6
compilerKind: ghc
- compilerVersion: 9.6.5
+ compilerVersion: 9.6.6
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.8
@@ -85,17 +90,30 @@ jobs:
allow-failure: false
fail-fast: false
steps:
- - name: apt
+ - name: apt-get install
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
+ apt-get install -y libpq-dev
+ - name: Install GHCup
+ run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
+ - name: Install cabal-install
+ run: |
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+ - name: Install GHC (GHCup)
+ if: matrix.setup-method == 'ghcup'
+ run: |
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
- "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
- apt-get update
- apt-get install -y libpq-dev
+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+ echo "HC=$HC" >> "$GITHUB_ENV"
+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+ echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
@@ -106,21 +124,12 @@ jobs:
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
- HCDIR=/opt/$HCKIND/$HCVER
- HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
- HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
- HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
- echo "HC=$HC" >> "$GITHUB_ENV"
- echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
- echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
- echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
@@ -261,8 +270,8 @@ jobs:
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' all
- name: save cache
- uses: actions/cache/save@v4
if: always()
+ uses: actions/cache/save@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
diff --git a/postgresql-libpq-configure/postgresql-libpq-configure.cabal b/postgresql-libpq-configure/postgresql-libpq-configure.cabal
index 48133f0..109f95e 100644
--- a/postgresql-libpq-configure/postgresql-libpq-configure.cabal
+++ b/postgresql-libpq-configure/postgresql-libpq-configure.cabal
@@ -26,9 +26,10 @@ tested-with:
|| ==9.0.2
|| ==9.2.8
|| ==9.4.8
- || ==9.6.5
- || ==9.8.2
+ || ==9.6.6
+ || ==9.8.4
|| ==9.10.1
+ || ==9.12.1
build-type: Configure
extra-source-files:
diff --git a/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal b/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal
index 1f7459c..b8f4f89 100644
--- a/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal
+++ b/postgresql-libpq-pkgconfig/postgresql-libpq-pkgconfig.cabal
@@ -26,9 +26,10 @@ tested-with:
|| ==9.0.2
|| ==9.2.8
|| ==9.4.8
- || ==9.6.5
- || ==9.8.2
+ || ==9.6.6
+ || ==9.8.4
|| ==9.10.1
+ || ==9.12.1
extra-source-files: CHANGELOG.md
diff --git a/postgresql-libpq.cabal b/postgresql-libpq.cabal
index 2a5652b..d0c2c85 100644
--- a/postgresql-libpq.cabal
+++ b/postgresql-libpq.cabal
@@ -1,6 +1,7 @@
cabal-version: 2.4
name: postgresql-libpq
version: 0.11.0.0
+x-revision: 1
synopsis: low-level binding to libpq
description:
This is a binding to libpq: the C application
@@ -30,9 +31,10 @@ tested-with:
|| ==9.0.2
|| ==9.2.8
|| ==9.4.8
- || ==9.6.5
- || ==9.8.2
+ || ==9.6.6
+ || ==9.8.4
|| ==9.10.1
+ || ==9.12.1
extra-source-files: CHANGELOG.md
@@ -71,7 +73,7 @@ library
Database.PostgreSQL.LibPQ.Ptr
build-depends:
- , base >=4.12.0.0 && <4.21
+ , base >=4.12.0.0 && <4.22
, bytestring >=0.10.8.2 && <0.13
if !os(windows)