diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 705288a..52ba1b6 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250605 +# version: 0.19.20260209 # -# REGENDATA ("0.19.20250605",["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 }} @@ -102,8 +107,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: | @@ -179,7 +184,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 @@ -212,11 +217,17 @@ jobs: echo "packages: ${PKGDIR_postgresql_libpq_pkgconfig}" >> cabal.project echo "packages: ${PKGDIR_postgresql_libpq_configure}" >> cabal.project echo "package postgresql-libpq" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package postgresql-libpq-pkgconfig" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package postgresql-libpq-configure" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package postgresql-libpq" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package postgresql-libpq-pkgconfig" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package postgresql-libpq-configure" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/.github/workflows/simple.yml b/.github/workflows/simple.yml index 99a2438..1f9f8b6 100644 --- a/.github/workflows/simple.yml +++ b/.github/workflows/simple.yml @@ -33,7 +33,7 @@ jobs: 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 @@ -42,7 +42,7 @@ jobs: postgres-version: "14" - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Cache uses: actions/cache@v4 diff --git a/cabal.haskell-ci b/cabal.haskell-ci index b0abf40..18bdd1f 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -2,5 +2,7 @@ branches: master postgresql: True apt: libpq-dev +error-unused-packages: False + constraint-set pkg-config constraints: postgresql-libpq +use-pkg-config