Add GHC 9.10 to Cabal CI

google · Dec 2, 2024 · 8687639 · 8687639
1 parent 7694e28
commit 8687639
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/cabal-ci.yml b/.github/workflows/cabal-ci.yml
@@ -1,19 +1,26 @@
 on:
   - push
   - pull_request
-name: cabal build with ghc 9.6
+name: cabal build
 jobs:
   runhaskell:
     name: cabal test
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version:
+          - ghc: 9.6.3
+            cabal: 3.10.2.0
+          - ghc: 9.10.1
+            cabal: 3.12.1.0
     steps:
       - uses: actions/[email protected]
         with:
           submodules: true
       - uses: haskell-actions/setup@dd344bc1cec854a369df8814ce17ef337d6e6170 # v2.7.6
         with:
-          ghc-version: '9.6.3'
-          cabal-version: '3.10.2.0'
-      - run: cabal build --dependencies-only --project-file ghc96.cabal.project all
-      - run: cabal build                     --project-file ghc96.cabal.project all
-      - run: cabal test                      --project-file ghc96.cabal.project all
+          ghc-version: ${{ matrix.version.ghc }}
+          cabal-version: ${{ matrix.version.cabal }}
+      - run: cabal build --dependencies-only --project-file ghc${{ matrix.version.ghc }}.cabal.project all
+      - run: cabal build                     --project-file ghc${{ matrix.version.ghc }}.cabal.project all
+      - run: cabal test                      --project-file ghc${{ matrix.version.ghc }}.cabal.project all
diff --git a/ghc9.10.1.cabal.project b/ghc9.10.1.cabal.project
@@ -0,0 +1,10 @@
+ packages:
+   proto-lens
+   proto-lens-runtime
+   proto-lens-optparse
+
+source-repository-package
+  type: git
+  location: https://github.com/google/ghc-source-gen
+  tag: 1f0ccfc5a236e349cd48c372deda373121cd9734
+
diff --git a/ghc96.cabal.project → ghc9.6.3.cabal.project b/ghc96.cabal.project → ghc9.6.3.cabal.project