Skip to content

Commit 2b67a7b

Browse files
cabal ci tweaks
1 parent 043143c commit 2b67a7b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/cabal.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,28 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
cabal: ["3.2", "2.4"]
23-
ghc: ["8.6.5", "8.8.3", "8.10.1"]
22+
plan:
23+
- { ghc: "8.6.5", cabal: "2.4.0.1" }
24+
- { ghc: "8.8.3", cabal: "3.0.1" }
25+
- { ghc: "8.10.1", cabal: "3.2" }
2426
env:
2527
CONFIG: "--enable-tests --enable-benchmarks"
2628
steps:
2729
- uses: actions/checkout@v2
2830
- uses: actions/setup-haskell@v1.1.2
2931
id: setup-haskell-cabal
3032
with:
31-
ghc-version: ${{ matrix.ghc }}
32-
cabal-version: ${{ matrix.cabal }}
33+
ghc-version: ${{ matrix.plan.ghc }}
34+
cabal-version: ${{ matrix.plan.cabal }}
3335
- run: cabal v2-update
3436
- run: cabal v2-freeze $CONFIG
3537
- uses: actions/cache@v2
3638
with:
3739
path: |
3840
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
3941
dist-newstyle
40-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
42+
key: ${{ runner.os }}-${{ matrix.plan.ghc }}-${{ hashFiles('cabal.project.freeze') }}
4143
restore-keys: |
42-
${{ runner.os }}-${{ matrix.ghc }}-
44+
${{ runner.os }}-${{ matrix.plan.ghc }}-
4345
- run: cabal v2-build $CONFIG
4446
- run: cabal v2-test $CONFIG

quickjs-hs.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ library
6565
-DCONFIG_VERSION="2020-07-05"
6666
-DCONFIG_BIGNUM
6767

68-
6968
test-suite quickjs-hs-test
7069
type: exitcode-stdio-1.0
7170
main-is: Spec.hs

0 commit comments

Comments
 (0)