Support latest GHCs (#6)

Author: Kleidukos

.github/workflows/ci.yml

@@ -1,63 +1,51 @@
-name: Tests
+name: CI
 
+# Trigger the workflow on push or pull request, but only for the main branch
 on:
   pull_request:
   push:
     branches: ["main"]
 
 jobs:
-  generateMatrix:
-    name: "Generate matrix"
-    runs-on: ubuntu-latest
+  generate-matrix:
+    name: "Generate matrix from cabal"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout base repo
-        uses: actions/checkout@v3
       - name: Extract the tested GHC versions
         id: set-matrix
-        run: |
-          wget -q https://github.com/Kleidukos/get-tested/releases/download/v0.1.4.0/get-tested-0.1.4.0-linux-amd64 -O get-tested
-          chmod +x get-tested
-          ./get-tested --ubuntu pg-transact-effectful.cabal >> $GITHUB_OUTPUT
-
+        uses: kleidukos/get-tested@v0.1.7.0
+        with:
+          cabal-file: pg-transact-effectful.cabal
+          ubuntu-version: "latest"
+          version: 0.1.7.0
   tests:
     name: ${{ matrix.ghc }} on ${{ matrix.os }}
-    needs: generateMatrix
+    needs: generate-matrix
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix: ${{ fromJSON(needs.generateMatrix.outputs.matrix) }}
+      matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
     steps:
-    - name: Checkout base repo
-      uses: actions/checkout@v3
-
-    - name: "Configure ghcup"
-      run: |
-        ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
-
-    - name: Set up Haskell
-      id: setup-haskell
-      uses: haskell/actions/setup@v2
-      with:
-        ghc-version: "${{ matrix.ghc }}"
-        cabal-version: "latest"
-
-    - name: Configure environment
-      run: |
-        # sudo apt install -y postgresql-14 libpq-dev 
-        # echo "/usr/lib/postgresql/14/bin/" >> $GITHUB_PATH
-        echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
-        echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-        cabal freeze
-
-    - name: Cache
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.setup-haskell.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
-        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
-
-    - name: Build
-      run: |
-        make build
+      - name: Checkout base repo
+        uses: actions/checkout@v4
+
+      - name: Set up Haskell
+        id: setup-haskell
+        uses: haskell-actions/setup@v2
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: 'latest'
+
+      - name: Freeze
+        run: cabal freeze
+
+      - name: Haskell cache restoration
+        uses: actions/cache@v4.2.0
+        with:
+          path: ${{ steps.setup-haskell.outputs.cabal-store }}
+          key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }}
+          restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
+
+      - name: Build Library
+        run: cabal build pg-transact-effectful

.github/workflows/linting.yml

@@ -13,7 +13,7 @@ jobs:
 
     - uses: haskell-actions/run-fourmolu@v9
       with:
-        version: "0.12.0.0"
+        version: "0.17.0.0"
         pattern: |
           src/**/*.hs
 

fourmolu.yaml

@@ -4,7 +4,12 @@ import-export-style: leading
 record-brace-space: false # rec {x = 1} vs. rec{x = 1}
 indent-wheres: true # 'false' means save space by only half-indenting the 'where' keyword
 respectful: true # don't be too opinionated about newlines etc.
-haddock-style: multi-line-compact # '--' vs. '{-'
+haddock-style: single-line # '--' vs. '{-'
 newlines-between-decls: 1 # number of newlines between top-level declarations
 fixities: []
 function-arrows: leading
+single-constraint-parens: never
+import-grouping: by-scope
+sort-constraints: true
+sort-derived-classes: true
+sort-deriving-clauses: true

pg-transact-effectful.cabal

@@ -8,12 +8,11 @@ maintainer:         Hécate Moonlight
 license:            MIT
 build-type:         Simple
 extra-source-files:
-  CHANGELOG.md
   LICENSE.md
   README.md
 
-tested-with:
-  GHC ==9.4.7 || ==9.6.3
+extra-doc-files:    CHANGELOG.md
+tested-with:        GHC ==9.6.6 || ==9.8.4 || ==9.10.1
 
 source-repository head
   type:     git
@@ -36,7 +35,7 @@ common common-extensions
 
 common common-ghc-options
   ghc-options:
-    -Wall -Wcompat -Werror -Widentities -Wincomplete-record-updates
+    -Wall -Wcompat -Widentities -Wincomplete-record-updates
     -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints
     -fhide-source-paths -Wno-unused-do-bind
     -Wno-unticked-promoted-constructors
@@ -53,9 +52,9 @@ library
     Effectful.PostgreSQL.Transact.Effect
 
   build-depends:
-    , base               <4.19.0
+    , base               <4.22.0
     , deepseq
-    , effectful-core     ^>=2.3
+    , effectful-core     >=2.3
     , mtl
     , pg-transact
     , postgresql-simple

src/Effectful/PostgreSQL/Transact.hs

@@ -6,11 +6,12 @@ import Data.Kind (Type)
 import Database.PostgreSQL.Simple (FromRow, Query, ToRow)
 import qualified Database.PostgreSQL.Transact as DBT
 import Effectful (Eff, Effect, type (:>))
+
 import Effectful.PostgreSQL.Transact.Effect
 
 query
   :: forall (es :: [Effect]) (parameters :: Type) (b :: Type)
-   . (DB :> es, ToRow parameters, FromRow b, NFData b)
+   . (DB :> es, FromRow b, NFData b, ToRow parameters)
   => Query
   -> parameters
   -> Eff es [b]
@@ -25,7 +26,7 @@ query_ q = dbtToEff $ DBT.query_ q
 
 queryOne
   :: forall (es :: [Effect]) (parameters :: Type) (b :: Type)
-   . (DB :> es, ToRow parameters, FromRow b, NFData b)
+   . (DB :> es, FromRow b, NFData b, ToRow parameters)
   => Query
   -> parameters
   -> Eff es (Maybe b)
@@ -40,22 +41,22 @@ queryOne_ q = dbtToEff $ DBT.queryOne_ q
 
 execute
   :: forall (es :: [Effect]) (parameters :: Type)
-   . (ToRow parameters, DB :> es)
+   . (DB :> es, ToRow parameters)
   => Query
   -> parameters
   -> Eff es Int64
 execute q parameters = dbtToEff $ DBT.execute q parameters
 
 execute_
   :: forall (es :: [Effect])
-   . (DB :> es)
+   . DB :> es
   => Query
   -> Eff es Int64
 execute_ q = dbtToEff $ DBT.execute_ q
 
 executeMany
   :: forall (es :: [Effect]) (parameters :: Type)
-   . (ToRow parameters, DB :> es)
+   . (DB :> es, ToRow parameters)
   => Query
   -> [parameters]
   -> Eff es Int64

src/Effectful/PostgreSQL/Transact/Effect.hs

@@ -24,14 +24,14 @@ newtype instance StaticRep DB = DB (Pool Connection)
 
 runDB
   :: forall (es :: [Effect]) (a :: Type)
-   . (IOE :> es)
+   . IOE :> es
   => Pool Connection
   -> Eff (DB : es) a
   -> Eff es a
 runDB pool m = do
   evalStaticRep (DB pool) m
 
-getPool :: (DB :> es) => Eff es (Pool Connection)
+getPool :: DB :> es => Eff es (Pool Connection)
 getPool = do
   DB pool <- getStaticRep
   pure pool