From cb02ca22d1933b67c44ba93ddbe7a48b7742f754 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Wed, 15 Jan 2025 16:12:47 +0000
Subject: [PATCH 1/2] Fix ubuntu CI

---
 .github/workflows/main.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54d9325..fc34788 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.8.2']
-        os: ['ubuntu-latest', 'macos-latest']
+        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
@@ -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

From 091bbe75162177fc14562ab16b80cf8113ef0f33 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Wed, 15 Jan 2025 16:17:46 +0000
Subject: [PATCH 2/2] Bump action scheduled for deprecation

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc34788..353ce02 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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