Merge pull request #47 from alexfmpe/ghc-9.10

Build with ghc 9.10
obsidiansystems · Jan 19, 2025 · 00d5865 · 00d5865
2 parents 32f0147 + 860f11a
commit 00d5865
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.8.2']
-        os: ['ubuntu-latest', 'macos-latest']
+        ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.8.2', '9.10.1']
+        os: ['ubuntu-latest'] # Disabled macos until https://github.com/haskellari/postgresql-libpq/issues/71 is figured out
     name: Haskell GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -18,7 +18,7 @@ jobs:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: ${{ matrix.cabal }}
       - name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cabal/packages
@@ -28,18 +28,13 @@ jobs:
       - name: install postgres (linux)
         run: |
           sudo apt-get update
-          sudo apt-get install postgresql-14
-          export PATH=$PATH:/usr/lib/postgresql/14/bin
-          which pg_ctl
-          echo "/usr/lib/postgresql/14/bin" >> $GITHUB_PATH
+          sudo apt-get install postgresql-16
+          echo "/usr/lib/postgresql/16/bin" >> $GITHUB_PATH
         if: matrix.os == 'ubuntu-latest'
       - name: install postgres (macos)
         run: |
           brew update
           brew install postgresql@14
-          export PATH=$PATH:`brew --prefix`/bin
-          which pg_ctl
-          echo "$(brew --prefix)/bin" >> $GITHUB_PATH
         if: matrix.os == 'macos-latest'
       - name: build all
         run: cabal build all
diff --git a/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal b/gargoyle-postgresql-connect/gargoyle-postgresql-connect.cabal
@@ -18,7 +18,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base                     >=4.12  && <4.20
+      base                     >=4.12  && <4.21
     , bytestring               >=0.10  && <0.13
     , directory                >=1.3   && <1.4
     , gargoyle                 >=0.1.1.0 && < 0.2

diff --git a/gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal b/gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal
@@ -24,7 +24,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base                 >=4.12 && <4.20
+      base                 >=4.12 && <4.21
     , bytestring           >=0.10 && <0.13
     , gargoyle             >=0.1  && <0.2
     , gargoyle-postgresql  >=0.2  && <0.3

diff --git a/gargoyle-postgresql/gargoyle-postgresql.cabal b/gargoyle-postgresql/gargoyle-postgresql.cabal
@@ -45,7 +45,7 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base          >=4.12  && <4.20
+      base          >=4.12  && <4.21
     , bytestring    >=0.10  && <0.13
     , directory     >=1.3   && <1.4
     , gargoyle      >=0.1.1.0 && < 0.2

diff --git a/gargoyle/gargoyle.cabal b/gargoyle/gargoyle.cabal
@@ -29,11 +29,11 @@ library
   ghc-options:      -Wall
   ghc-prof-options: -fprof-auto-exported
   build-depends:
-      base       >=4.12.0 && <4.20
+      base       >=4.12.0 && <4.21
     , directory  >=1.3.3  && <1.4
     , filelock   >=0.1.1  && <0.2
-    , filepath   >=1.4.2  && <1.5
-    , network    >=2.6.0  && <3.2
+    , filepath   >=1.4.2  && <1.6
+    , network    >=2.6.0  && <3.3
     , process    >=1.5.0  && <1.7
     , unix       >=2.7.2  && <2.9