use fixed cabal version per #10175

(cherry picked from commit 273cb0a)
haskell · Aug 30, 2024 · e9b394b · e9b394b
1 parent ef670f2
commit e9b394b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -107,7 +107,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
@@ -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