Merge branch 'ghc-9.8.4'

haskell · Dec 2, 2024 · 6fb2b17 · 6fb2b17
2 parents 8b6063f + 790ac55
commit 6fb2b17
Show file tree

Hide file tree

Showing 32 changed files with 19 additions and 2,880 deletions.
diff --git a/.github/workflows/cabal.project.yaml b/.github/workflows/cabal.project.yaml
@@ -20,14 +20,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [macOS-13, windows-latest, ubuntu-latest]
-        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6"]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.4", "9.10.1"]
         include:
           - os: macOS-latest
             ghc: "9.2.8"
           - os: macOS-latest
             ghc: "9.4.8"
           - os: macOS-latest
             ghc: "9.6.6"
+          - os: macOS-latest
+            ghc: "9.8.4"
+          - os: macOS-latest
+            ghc: "9.10.1"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -41,7 +45,7 @@ jobs:
           [ -e ~/.ghcup/env ] && source ~/.ghcup/env
           ghcup --version
           ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal update
-          ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal build --project-file=cabal.ghc${GHC_VER//./}.project
+          ghcup run -i --cabal latest --ghc ${GHC_VER} -- cabal build -w ghc-${GHC_VER}
         env:
           GHC_VER: ${{ matrix.ghc }}
         shell: bash

diff --git a/cabal.ghc8107.Unix.project b/cabal.ghc8107.Unix.project
diff --git a/cabal.ghc8107.Unix.project.freeze b/cabal.ghc8107.Unix.project.freeze
diff --git a/cabal.ghc8107.Win32.project b/cabal.ghc8107.Win32.project