From c21cc23de74a28035e809c4ea1afaa57dde31d79 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Thu, 29 Feb 2024 16:18:32 +0100 Subject: [PATCH] Drop support for GHC 8.8 (#69) --- .github/workflows/haskell-ci.yml | 27 +++++++++++---------------- CHANGELOG.md | 1 + hpqtypes.cabal | 14 ++++++-------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 154e293..aa25c57 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.17.20231010 +# version: 0.18.1 # -# REGENDATA ("0.17.20231010",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.18.1",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -38,19 +38,19 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.8.1 + - compiler: ghc-9.8.2 compilerKind: ghc - compilerVersion: 9.8.1 + compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.3 + - compiler: ghc-9.6.4 compilerKind: ghc - compilerVersion: 9.6.3 + compilerVersion: 9.6.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.7 + - compiler: ghc-9.4.8 compilerKind: ghc - compilerVersion: 9.4.7 + compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.2.8 @@ -68,11 +68,6 @@ jobs: compilerVersion: 8.10.7 setup-method: ghcup allow-failure: false - - compiler: ghc-8.8.4 - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: ghcup - allow-failure: false fail-fast: false steps: - name: apt @@ -80,10 +75,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -101,7 +96,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.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" diff --git a/CHANGELOG.md b/CHANGELOG.md index c537008..e91de63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # hpqtypes-1.12.0.0 (????-??-??) +* Drop support for GHC 8.8. * Attach `CallStack` to `DBException`. # hpqtypes-1.11.1.2 (2023-11-08) diff --git a/hpqtypes.cabal b/hpqtypes.cabal index 5cef3e6..de0e953 100644 --- a/hpqtypes.cabal +++ b/hpqtypes.cabal @@ -1,3 +1,5 @@ +cabal-version: 3.0 +build-type: Simple name: hpqtypes version: 1.12.0.0 synopsis: Haskell bindings to libpqtypes @@ -13,16 +15,13 @@ description: Efficient and easy-to-use bindings to (slightly modified) directory. homepage: https://github.com/scrive/hpqtypes -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Scrive AB maintainer: Andrzej Rybczak copyright: Scrive AB category: Database -build-type: Simple -cabal-version: 1.24 -tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.7 || ==9.6.3 - || ==9.8.1 +tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.4, 9.8.2 } extra-source-files: README.md , CHANGELOG.md @@ -93,7 +92,7 @@ library , Database.PostgreSQL.PQTypes.Internal.C.Interface , Database.PostgreSQL.PQTypes.Internal.C.Get - build-depends: base >= 4.13 && < 5 + build-depends: base >= 4.14 && < 5 , text >= 0.11 , aeson >= 1.0 , async >= 2.1.1.1 @@ -119,7 +118,6 @@ library ghc-options: -Wall - build-tools: hsc2hs include-dirs: libpqtypes/src cc-options: -DHAVE_CONFIG_H -D_GNU_SOURCE -D_REENTRANT -std=gnu99 -fsigned-char -fno-strict-aliasing -Wall -Wextra @@ -180,7 +178,7 @@ test-suite hpqtypes-tests Test.Aeson.Compat Test.QuickCheck.Arbitrary.Instances build-depends: hpqtypes - , base >= 4.13 && < 5 + , base >= 4.14 && < 5 , HUnit >= 1.2 , QuickCheck >= 2.7 , aeson >= 0.6.2.0