Skip to content

Commit 7dea52b

Browse files
bring back stack yaml
1 parent e736ac9 commit 7dea52b

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ jobs:
5151
run: cabal test --enable-tests
5252

5353
stack:
54-
name: stack ${{ matrix.os }} / ghc ${{ matrix.ghc }}
54+
name: ${{ matrix.os }} / ${{ matrix.stack-yaml }}
5555
runs-on: ubuntu-latest
5656
strategy:
5757
matrix:
5858
stack:
5959
- 2.11.1
60-
ghc:
61-
- 9.0.2
62-
- 9.2.8
63-
- 9.4.5
60+
stack-yaml:
61+
- stack-8.10.7.yaml
62+
- stack-9.0.2.yaml
63+
- stack-9.2.5.yaml
64+
- stack-9.4.5.yaml
6465
services:
6566
postgres:
6667
image: postgres:15
@@ -75,20 +76,19 @@ jobs:
7576
- uses: haskell/actions/setup@v2
7677
name: Setup Haskell Stack
7778
with:
78-
ghc-version: ${{ matrix.ghc }}
7979
stack-version: ${{ matrix.stack }}
8080

8181
- uses: actions/cache@v3
8282
name: Cache ~/.stack
8383
with:
8484
path: ~/.stack
85-
key: ${{ runner.os }}-${{ matrix.ghc }}-stack
85+
key: ${{ runner.os }}-${{ matrix.stack-yaml }}
8686

8787
- name: Install dependencies
88-
run: stack build --test --bench --no-run-tests --no-run-benchmarks --only-dependencies
88+
run: stack build --stack-yaml ${{ matrix.stack-yaml }} --test --bench --no-run-tests --no-run-benchmarks --only-dependencies
8989

9090
- name: Build
91-
run: stack build --test --bench --no-run-tests --no-run-benchmarks
91+
run: stack build --stack-yaml ${{ matrix.stack-yaml }} --test --bench --no-run-tests --no-run-benchmarks
9292

9393
- name: Test
94-
run: stack test
94+
run: stack test --stack-yaml ${{ matrix.stack-yaml }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cabal.project.local
2323
.HTF/
2424
# Stack
2525
.stack-work/
26-
*.yaml.lock
26+
stack-*.yaml.lock
2727

2828
### IDE/support
2929
# Vim

stack-8.10.7.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
resolver: lts-18.28

stack-9.0.2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
resolver: lts-19.31

stack-9.2.8.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
resolver: lts-20.26
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
resolver: lts-21.0
22

33
extra-deps:
4-
# https://github.com/commercialhaskell/stackage/issues/6852
54
- resource-pool-0.2.3.2@sha256:0955486bc1db37e4eb27acb964185f9e9cb8ad5ce054c85e1e6fd7562b2d7542,1375

0 commit comments

Comments
 (0)