Merge pull request #166 from haskellari/update-ci

Update CI

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20250722
+# version: 0.19.20260209
 #
-# REGENDATA ("0.19.20250722",["github","cabal.project"])
+# REGENDATA ("0.19.20260209",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -20,6 +20,11 @@ on:
   pull_request:
     branches:
       - master
+  merge_group:
+    branches:
+      - master
+  workflow_dispatch:
+    {}
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -101,8 +106,8 @@ jobs:
           chmod a+x "$HOME/.ghcup/bin/ghcup"
       - name: Install cabal-install
         run: |
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
       - name: Install GHC (GHCup)
         if: matrix.setup-method == 'ghcup'
         run: |
@@ -178,7 +183,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: source
       - name: initial cabal.project for sdist

.github/workflows/simple.yml

@@ -14,7 +14,8 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
-        ghc: ['9.4.8','9.6.6','9.8.2','9.10.1']
+        # Older GHCs need LLVM on macos-latest (ARM)
+        ghc: ['9.4.8','9.6.6','9.8.2','9.10.2']
       fail-fast: false
     timeout-minutes:
       60
@@ -29,18 +30,19 @@ jobs:
         uses: haskell-actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: '3.12.1.0'
+          cabal-version: '3.10.2.0'
 
       - name: Set up PostgreSQL
-        uses: ikalnytskyi/action-setup-postgres@v6
+        uses: ikalnytskyi/action-setup-postgres@v8
         id: postgres
         with:
           username: ci
           password: sw0rdfish
           database: test
+          postgres-version: "14"
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Cache
         uses: actions/cache@v4
@@ -49,6 +51,20 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
           restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
 
+      - name: cabal.project (win)
+        if: matrix.os == 'windows-latest'
+        run: cp cabal.project.win cabal.project
+
+      - name: cabal.project (macos)
+        if: matrix.os == 'macos-latest'
+        run: cp cabal.project.macos cabal.project
+
+      - name: ghc-pkg dump
+        run: ghc-pkg list
+
+      - name: Dependencies
+        run: cabal build all --enable-tests --only-dependencies
+
       - name: Build
         run: cabal build all --enable-tests
 

cabal.project.macos

@@ -0,0 +1,7 @@
+packages: .
+tests: true
+
+constraints: unix installed
+
+package postgresql-libpq
+  flags: -use-pkg-config

cabal.project.win

@@ -0,0 +1,7 @@
+packages: .
+tests: true
+
+constraints: Win32 installed
+
+package postgresql-libpq
+  flags: -use-pkg-config