Skip to content

Commit 77c1ee5

Browse files
committed
ci: make tests use correct ghc version
1 parent 9027edb commit 77c1ee5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
# - { ghc: "82" , stack: "stack --stack-yaml=stack8.2.yaml" }
4141
# - { ghc: "84" , stack: "stack --stack-yaml=stack8.4.yaml" }
4242
# - { ghc: "86" , stack: "stack --stack-yaml=stack8.6.yaml" }
43-
- { ghc: "88" , stack: "stack --stack-yaml=stack.yaml" }
44-
- { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" }
43+
- { ghc: "88" , stackyaml: "stack.yaml", stack: "stack --stack-yaml=stack.yaml" }
44+
- { ghc: "810" , stackyaml: "stack8.10.yaml", stack: "stack --stack-yaml=stack8.10.yaml" }
4545

4646
steps:
4747

@@ -106,8 +106,7 @@ jobs:
106106
- name: Run functional tests (excluding windows tests)
107107
env:
108108
stack: ${{ matrix.plan.stack }}
109+
stackyaml: ${{ matrix.plan.stackyaml }}
109110
run: |
110111
export PATH=~/.local/bin:$PATH
111-
make test
112-
# $stack exec -- shelltest --execdir -j16 tests -x /bin -x /addons
113-
#COLUMNS=80
112+
STACKYAML=${{ stackyaml }} make test

0 commit comments

Comments
 (0)