From daeb83dae20c8655feb669a751d5f020b3ae0af6 Mon Sep 17 00:00:00 2001 From: Max Ulidtko Date: Fri, 14 Jun 2024 14:06:37 +0200 Subject: [PATCH] fix(CI): Relax .installed constraints on Cabal & Cabal-syntax Workaround for https://github.com/haskell/cabal/issues/9917 --- .github/workflows/haskell-ci.yml | 2 +- cabal.haskell-ci | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 508a0ef..0197867 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -217,7 +217,7 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|Cabal-syntax|cabal-doctest|multiple-components-example|simple-example)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 06a3ec2..0cfa580 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -2,4 +2,10 @@ branches: master -- jobs-selection: any -- Older haddocks error out for various reasons -haddock: >= 9.4 \ No newline at end of file +haddock: >= 9.4 + +-- Not pinned: the version decision is on haskell-ci +-- cabal-install-version: 3.10.3.0 + +-- Workaround for https://github.com/haskell/cabal/issues/9917 +installed: +all -Cabal -Cabal-syntax