Skip to content

Commit 0b6adc0

Browse files
committed
Update CI
1 parent a34848c commit 0b6adc0

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

.github/workflows/ci.yaml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1+
# Code generated by dhall-to-yaml. DO NOT EDIT.
12
jobs:
23
build:
3-
runs-on: ubuntu-latest
4+
"runs-on": "ubuntu-latest"
45
steps:
5-
- uses: "actions/checkout@v3"
6-
- id: setup-haskell-cabal
7-
uses: "haskell-actions/setup@v2"
8-
with:
9-
cabal-version: '3.10'
10-
enable-stack: false
11-
ghc-version: '9.4.7'
12-
- name: Update Hackage repository
13-
run: cabal update
14-
- name: cabal.project.local.ci
15-
run: |
16-
if [ -e cabal.project.local.ci ]; then
17-
cp cabal.project.local.ci cabal.project.local
18-
fi
19-
- name: freeze
20-
run: cabal freeze
21-
- uses: "actions/cache@v3"
22-
with:
23-
key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
24-
path: |
25-
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
26-
dist-newstyle
27-
- name: Install dependencies
28-
run: cabal build all --enable-tests --enable-benchmarks --only-dependencies
29-
- name: build all
30-
run: cabal build all --enable-tests --enable-benchmarks
31-
- name: test all
32-
run: cabal test all --enable-tests
33-
- name: haddock all
34-
run: cabal haddock all
6+
- uses: "actions/checkout@v4"
7+
- id: "setup-haskell-cabal"
8+
uses: "haskell-actions/setup@v2"
9+
with:
10+
"cabal-version": '3.10'
11+
"enable-stack": false
12+
"ghc-version": '9.4.7'
13+
- name: Update Hackage repository
14+
run: cabal update
15+
- name: cabal.project.local.ci
16+
run: |
17+
if [ -e cabal.project.local.ci ]; then
18+
cp cabal.project.local.ci cabal.project.local
19+
fi
20+
- name: freeze
21+
run: "cabal freeze --enable-tests --enable-benchmarks"
22+
- uses: "actions/cache@v3"
23+
with:
24+
key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
25+
path: |
26+
${{ steps.setup-haskell-cabal.outputs.cabal-store }}
27+
dist-newstyle
28+
- name: Install dependencies
29+
run: "cabal build all --enable-tests --enable-benchmarks --only-dependencies"
30+
- name: build all
31+
run: "cabal build all --enable-tests --enable-benchmarks"
32+
- name: test all
33+
run: "cabal test all --enable-tests"
34+
- name: haddock
35+
run: cabal haddock
3536
name: Haskell CI
36-
on:
37-
- push
38-
- pull_request
37+
'on':
38+
- push
39+
- pull_request

ci.dhall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
let haskellCi =
2-
https://raw.githubusercontent.com/sorki/github-actions-dhall/pending/haskell-ci.dhall
2+
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
33

44
in haskellCi.defaultCi

ci.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ echo "regenerating .github/workflows/ci.yaml..."
88
mkdir -p .github/workflows
99

1010
# based on https://github.com/vmchale/github-actions-dhall
11-
which dhall-to-yaml || cabal install dhall-yaml
12-
dhall-to-yaml --file ci.dhall > .github/workflows/ci.yaml
11+
which dhall-to-yaml-ng || cabal install dhall-yaml
12+
dhall-to-yaml-ng --generated-comment --file ci.dhall > .github/workflows/ci.yaml

0 commit comments

Comments
 (0)