cabal-testsuite.cabal: bump custom-setup bounds on Cabal(-syntax) aft…

…er the release (backport #10172) (#10176) * cabal-testsuite.cabal: bump custom-setup bounds on Cabal(-syntax) after the release (cherry picked from commit e8e66c9) * ci: Use latest cabal-install for quick-jobs This matches the installation logic for the validate jobs. (cherry picked from commit e9d41c8) # Conflicts: # .github/workflows/quick-jobs.yml * fixup! resolve conflicts --------- Co-authored-by: Artem Pelenitsyn <[email protected]> Co-authored-by: Matthew Pickering <[email protected]>
haskell · Jul 4, 2024 · 85fcabe · 85fcabe
1 parent 260ecdc
commit 85fcabe
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml
@@ -30,12 +30,12 @@ jobs:
         gen-spdx-exc
     # This job is not run in a container, any recent GHC should be fine
     steps:
-      - name: ghcup
-        run: |
-          ghcup --version
-          ghcup config set cache true
-          ghcup install ghc $GHC_FOR_QUICK_JOBS
-          ghcup set ghc $GHC_FOR_QUICK_JOBS
+      - name: Install primary compiler
+        uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
+          cabal-version: latest
       - name: Haskell versions
         run: |
           ghc --version
@@ -73,6 +73,16 @@ jobs:
     name: Doctest Cabal
     runs-on: ubuntu-latest
     steps:
+      - name: Install primary compiler
+        uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
+          cabal-version: latest
+      - name: Haskell versions
+        run: |
+          ghc --version
+          cabal --version
       # It is complicated to get a proper cache key for the dependencies of a package
       # (here: doctest) that we just `cabal install`.
       # So, as a heuristics we update the cache once per day.
@@ -88,16 +98,6 @@ jobs:
           path: ~/.local/state/cabal
           key: linux-store-doctest-${{ env.DATE }}
           restore-keys: linux-store-doctest
-      - name: ghcup
-        run: |
-          ghcup --version
-          ghcup config set cache true
-          ghcup install ghc $GHC_FOR_QUICK_JOBS
-          ghcup set ghc $GHC_FOR_QUICK_JOBS
-      - name: Haskell versions
-        run: |
-          ghc --version
-          cabal --version
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v4
@@ -118,19 +118,12 @@ jobs:
     env:
       cabal_build: cabal build buildinfo-reference-generator
     steps:
-      - name: Set PATH
-        run: |
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-      - uses: actions/cache@v3
+      - name: Install primary compiler
+        uses: haskell-actions/setup@v2
+        id: setup-haskell
         with:
-          path: ~/.cabal/store
-          key: linux-store-buildinfo-doc-diff
-      - name: ghcup
-        run: |
-          ghcup --version
-          ghcup config set cache true
-          ghcup install ghc $GHC_FOR_QUICK_JOBS
-          ghcup set ghc $GHC_FOR_QUICK_JOBS
+          ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
+          cabal-version: latest
       - name: Haskell versions
         run: |
           ghc --version
@@ -162,15 +155,12 @@ jobs:
     name: Check Release Project
     runs-on: ubuntu-latest
     steps:
-      - name: Set PATH
-        run: |
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-      - name: ghcup
-        run: |
-          ghcup --version
-          ghcup config set cache true
-          ghcup install ghc $GHC_FOR_QUICK_JOBS
-          ghcup set ghc $GHC_FOR_QUICK_JOBS
+      - name: Install primary compiler
+        uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ env.GHC_FOR_QUICK_JOBS }}
+          cabal-version: latest
       - name: Haskell versions
         run: |
           ghc --version

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -146,6 +146,6 @@ custom-setup
   -- 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.10.*,
-                 Cabal-syntax == 3.10.*,
+  setup-depends: Cabal == 3.12.*,
+                 Cabal-syntax == 3.12.*,
                  base, filepath, directory