From e7810fdb4f7c88977178aca3523f7795bab14c7c Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 19 Aug 2024 17:54:33 +0300 Subject: [PATCH] rename --- .github/workflows/haskell-ci.yml | 8 ++++---- cabal.haskell-ci | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b897592..d63cec1 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -252,12 +252,12 @@ jobs: - name: prepare for constraint sets run: | rm -f cabal.project.local - - name: constraint set no-pkg-config + - name: constraint set pkg-config run: | - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq -use-pkg-config' all --dry-run + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' all --dry-run cabal-plan topo | sort - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq -use-pkg-config' --dependencies-only -j2 all - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq -use-pkg-config' all + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='postgresql-libpq +use-pkg-config' all - name: save cache uses: actions/cache/save@v4 if: always() diff --git a/cabal.haskell-ci b/cabal.haskell-ci index f1d531a..6b0b6d5 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -5,5 +5,5 @@ postgresql: True test-output-direct: False haddock-components: libs -constraint-set no-pkg-config - constraints: postgresql-libpq -use-pkg-config +constraint-set pkg-config + constraints: postgresql-libpq +use-pkg-config