From 7e57f80d638ced7ff6b42afa06ea00d8dcb32cd1 Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Wed, 7 Aug 2024 23:19:43 -0400 Subject: [PATCH] use fixed cabal version per #10175 (cherry picked from commit 273cb0acb5d9980c1181b9f6830161f9a6c86cae) --- .github/workflows/validate.yml | 2 +- cabal-testsuite/cabal-testsuite.cabal | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b78e51a624c..8714ba757eb 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -111,7 +111,7 @@ jobs: id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133 + cabal-version: 3.12.1.0 # see https://github.com/haskell/cabal/pull/10251 ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml # See the following link for a breakdown of the following step diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index 8e41ea3a820..f6b1b4fd1a5 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -143,9 +143,8 @@ executable test-runtime-deps custom-setup -- we only depend on even stable releases of lib:Cabal - -- and due to Custom complexity and ConstraintSetupCabalMaxVersion - -- it has to be the latest release version plus - -- you have to use the latest cabal-install release - setup-depends: Cabal == 3.12.*, - Cabal-syntax == 3.12.*, + -- and must match the release used in validate.yml (see + -- https://github.com/haskell/cabal/pull/10251) + setup-depends: Cabal ^>= 3.12.1, + Cabal-syntax ^>= 3.12.1, base, filepath, directory