Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
sorki committed Nov 11, 2023
1 parent e5e316c commit fc60d26
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 25 deletions.
30 changes: 17 additions & 13 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
jobs:
build:
runs-on: ubuntu-latest
name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
runs-on: "${{ matrix.os }}"
steps:
- name: CVC4 dependency
run: sudo apt install cvc4
- uses: "actions/checkout@v3"
- uses: "actions/checkout@v4"
with:
submodules: recursive
- id: setup-haskell-cabal
uses: "haskell/actions/setup@v2"
uses: "haskell-actions/setup@v2"
with:
cabal-version: "${{ matrix.cabal }}"
enable-stack: false
ghc-version: "${{ matrix.ghc }}"
- name: Update Hackage repository
run: cabal update
Expand All @@ -19,10 +21,10 @@ jobs:
cp cabal.project.local.ci cabal.project.local
fi
- name: freeze
run: cabal freeze
run: cabal freeze --enable-tests --enable-benchmarks
- uses: "actions/cache@v3"
with:
key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
key: "${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal}}-${{ hashFiles('cabal.project.freeze') }}"
path: |
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
dist-newstyle
Expand All @@ -33,16 +35,18 @@ jobs:
- name: test all
run: cabal test all --enable-tests
- name: haddock all
run: cabal haddock all
run: cabal haddock all
strategy:
matrix:
cabal:
- '3.6'
- '3.10'
ghc:
- '8.10.7'
- '9.0.2'
- '9.2.4'
- '9.6.3'
os:
- ubuntu-latest
name: Haskell CI
on:
- push
- pull_request
pull_request: {}
push: {}
schedule:
- cron: "4 20 10 * *"
18 changes: 6 additions & 12 deletions ci.dhall
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
let haskellCi =
https://raw.githubusercontent.com/sorki/github-actions-dhall/pending/haskell-ci.dhall
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall

in haskellCi.generalCi
( [ haskellCi.BuildStep.Name
( haskellCi.defaultCabalSteps
with extraSteps.pre
=
[ haskellCi.BuildStep.Name
{ name = "CVC4 dependency", run = "sudo apt install cvc4" }
]
# haskellCi.matrixSteps
)
( Some
{ ghc =
[ haskellCi.GHC.GHC8107
, haskellCi.GHC.GHC902
, haskellCi.GHC.GHC924
]
, cabal = [ haskellCi.Cabal.Cabal36 ]
}
)
haskellCi.DhallMatrix::{=}
: haskellCi.CI.Type

0 comments on commit fc60d26

Please sign in to comment.