From 61b8dfa7030258c125dbd3a18e263cc6eedfb978 Mon Sep 17 00:00:00 2001 From: Jan Hrcek <2716069+jhrcek@users.noreply.github.com> Date: Thu, 4 Jan 2024 07:51:46 +0100 Subject: [PATCH 1/2] Support ghc 9.8, bump dependency versions (#46) --- .github/workflows/haskell-ci.yml | 14 +++++++------- CHANGELOG.md | 6 +++++- postgresql-simple-named.cabal | 22 +++++++++++----------- stack-9.4.5.yaml | 1 - stack-9.4.8.yaml | 1 + stack-9.6.2.yaml | 1 - stack-9.6.3.yaml | 1 + stack-9.8.1.yaml | 1 + 8 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 stack-9.4.5.yaml create mode 100644 stack-9.4.8.yaml delete mode 100644 stack-9.6.2.yaml create mode 100644 stack-9.6.3.yaml create mode 100644 stack-9.8.1.yaml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index c0d3e5b..e491176 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -17,11 +17,11 @@ jobs: cabal: - "3.10" ghc: - - 8.10.7 - 9.0.2 - 9.2.8 - - 9.4.5 - - 9.6.2 + - 9.4.8 + - 9.6.3 + - 9.8.1 services: postgres: image: postgres:15 @@ -60,13 +60,13 @@ jobs: os: - ubuntu-latest stack: - - 2.11.1 + - 2.13.1 stack-yaml: - - stack-8.10.7.yaml - stack-9.0.2.yaml - stack-9.2.8.yaml - - stack-9.4.5.yaml - - stack-9.6.2.yaml + - stack-9.4.8.yaml + - stack-9.6.3.yaml + - stack-9.8.1.yaml services: postgres: image: postgres:15 diff --git a/CHANGELOG.md b/CHANGELOG.md index c8a3881..36d7c09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ `postgresql-simple-named` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.0.5.0 - Jan 4, 2024 + +* Add support for GHC 9.6 and 9.8 + ## 0.0.4.0 - Nov 2, 2022 * Add support for GHC 9.2 and 9.4 @@ -11,7 +15,7 @@ The changelog is available [on GitHub][2]. * Add support for GHC 8.10 and 9.0 * [#30](https://github.com/Holmusk/postgresql-simple-named/issues/30): - Fixes a bug with postgres-simple-named not recognising postgres JSON operators + Fixes a bug with postgres-simple-named not recognising postgres JSON operators ## 0.0.2.0 — Sep 10, 2019 diff --git a/postgresql-simple-named.cabal b/postgresql-simple-named.cabal index 785acb7..85c6c6c 100644 --- a/postgresql-simple-named.cabal +++ b/postgresql-simple-named.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: postgresql-simple-named -version: 0.0.4.0 +version: 0.0.5.0 synopsis: Implementation of named parameters for `postgresql-simple` library description: Implementation of named parameters for @postgresql-simple@ library. @@ -27,19 +27,19 @@ copyright: 2019 Holmusk category: Database, PostgreSQL build-type: Simple extra-source-files: README.md - , CHANGELOG.md -tested-with: GHC == 8.10.7 - , GHC == 9.0.2 +extra-doc-files: CHANGELOG.md +tested-with: GHC == 9.0.2 , GHC == 9.2.8 - , GHC == 9.4.5 - , GHC == 9.6.2 + , GHC == 9.4.8 + , GHC == 9.6.3 + , GHC == 9.8.1 source-repository head type: git location: https://github.com/Holmusk/postgresql-simple-named.git common common-options - build-depends: base >= 4.11 && < 4.19 + build-depends: base >= 4.11 && < 4.20 ghc-options: -Wall -Wincomplete-uni-patterns @@ -74,10 +74,10 @@ library import: common-options hs-source-dirs: src exposed-modules: PgNamed - build-depends: bytestring >= 0.10 && < 0.12 + build-depends: bytestring >= 0.10 && < 0.13 , mtl >= 2.2 && < 2.4 - , postgresql-simple >= 0.5 && < 0.7 - , text >= 1.2 && < 2.1 + , postgresql-simple >= 0.5 && < 0.8 + , text >= 1.2 && < 2.2 test-suite postgresql-simple-named-test import: common-options @@ -88,7 +88,7 @@ test-suite postgresql-simple-named-test build-depends: bytestring , hspec >= 2.5 , postgresql-simple-named - , postgresql-simple >= 0.5 && < 0.7 + , postgresql-simple >= 0.5 && < 0.8 , resource-pool ^>= 0.2.3.2 || ^>= 0.4.0.0 , transformers diff --git a/stack-9.4.5.yaml b/stack-9.4.5.yaml deleted file mode 100644 index bb875e4..0000000 --- a/stack-9.4.5.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: lts-21.0 diff --git a/stack-9.4.8.yaml b/stack-9.4.8.yaml new file mode 100644 index 0000000..377040a --- /dev/null +++ b/stack-9.4.8.yaml @@ -0,0 +1 @@ +resolver: lts-21.25 diff --git a/stack-9.6.2.yaml b/stack-9.6.2.yaml deleted file mode 100644 index 4ad7d90..0000000 --- a/stack-9.6.2.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: nightly-2023-08-02 diff --git a/stack-9.6.3.yaml b/stack-9.6.3.yaml new file mode 100644 index 0000000..2d0dc93 --- /dev/null +++ b/stack-9.6.3.yaml @@ -0,0 +1 @@ +resolver: lts-22.4 diff --git a/stack-9.8.1.yaml b/stack-9.8.1.yaml new file mode 100644 index 0000000..aa6485b --- /dev/null +++ b/stack-9.8.1.yaml @@ -0,0 +1 @@ +resolver: nightly-2024-01-03 From 7771273356a47878d14395dc27abc4e4ec7be4d0 Mon Sep 17 00:00:00 2001 From: Nitin Prakash Date: Fri, 5 Apr 2024 13:56:13 +0530 Subject: [PATCH 2/2] Target node20 in github actions + bump GHC version --- .github/workflows/haskell-ci.yml | 16 ++++++++-------- postgresql-simple-named.cabal | 4 ++-- stack-9.6.3.yaml | 1 - stack-9.6.4.yaml | 1 + stack-9.8.1.yaml | 1 - stack-9.8.2.yaml | 1 + 6 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 stack-9.6.3.yaml create mode 100644 stack-9.6.4.yaml delete mode 100644 stack-9.8.1.yaml create mode 100644 stack-9.8.2.yaml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e491176..836f9e1 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -20,8 +20,8 @@ jobs: - 9.0.2 - 9.2.8 - 9.4.8 - - 9.6.3 - - 9.8.1 + - 9.6.4 + - 9.8.2 services: postgres: image: postgres:15 @@ -31,10 +31,10 @@ jobs: - 5432:5432 steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Haskell Cabal - uses: haskell/actions/setup@v2 + uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} @@ -60,13 +60,13 @@ jobs: os: - ubuntu-latest stack: - - 2.13.1 + - 2.15.5 stack-yaml: - stack-9.0.2.yaml - stack-9.2.8.yaml - stack-9.4.8.yaml - - stack-9.6.3.yaml - - stack-9.8.1.yaml + - stack-9.6.4.yaml + - stack-9.8.2.yaml services: postgres: image: postgres:15 @@ -83,7 +83,7 @@ jobs: with: stack-version: ${{ matrix.stack }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Cache ~/.stack with: path: ~/.stack diff --git a/postgresql-simple-named.cabal b/postgresql-simple-named.cabal index 85c6c6c..ea9bf58 100644 --- a/postgresql-simple-named.cabal +++ b/postgresql-simple-named.cabal @@ -31,8 +31,8 @@ extra-doc-files: CHANGELOG.md tested-with: GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.3 - , GHC == 9.8.1 + , GHC == 9.6.4 + , GHC == 9.8.2 source-repository head type: git diff --git a/stack-9.6.3.yaml b/stack-9.6.3.yaml deleted file mode 100644 index 2d0dc93..0000000 --- a/stack-9.6.3.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: lts-22.4 diff --git a/stack-9.6.4.yaml b/stack-9.6.4.yaml new file mode 100644 index 0000000..8d1cf08 --- /dev/null +++ b/stack-9.6.4.yaml @@ -0,0 +1 @@ +resolver: lts-22.14 diff --git a/stack-9.8.1.yaml b/stack-9.8.1.yaml deleted file mode 100644 index aa6485b..0000000 --- a/stack-9.8.1.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: nightly-2024-01-03 diff --git a/stack-9.8.2.yaml b/stack-9.8.2.yaml new file mode 100644 index 0000000..fc5b695 --- /dev/null +++ b/stack-9.8.2.yaml @@ -0,0 +1 @@ +resolver: nightly-2024-04-05