Skip to content

Commit 9d962e0

Browse files
authored
Merge pull request #5358 from commercialhaskell/stable-ghc810
Add stack-ghc-810.yaml and Github Actions job
2 parents 828d22c + 46b9d29 commit 9d962e0

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

.github/workflows/unit-tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ jobs:
5454
stack-yaml: stack-ghc-88.yaml
5555
extra-suffix: ""
5656
stack-args: ""
57+
- os: ubuntu-latest
58+
stack-yaml: stack-ghc-810.yaml
59+
extra-suffix: ""
60+
stack-args: ""
5761
- os: ubuntu-latest
5862
stack-yaml: stack.yaml
5963
extra-suffix: "alpine"

src/Stack/SDist.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ getCabalLbs pvpBounds mrev cabalfp sourceMap = do
232232
[ style Url "https://github.com/commercialhaskell/stack/issues/new"
233233
, style Url "https://github.com/haskell/cabal/issues/new"
234234
]
235-
, flow $ "The parse error is: " ++ unlines (map show errs)
235+
, flow $ "The parse error is: " ++ unlines (map show (toList errs))
236236
, ""
237237
]
238238
return

stack-ghc-810.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
resolver: nightly-2020-08-03
2+
3+
packages:
4+
- .
5+
6+
docker:
7+
enable: false
8+
repo: fpco/stack-build:lts-16.0
9+
10+
nix:
11+
# --nix on the command-line to enable.
12+
packages:
13+
- zlib
14+
- unzip
15+
flags:
16+
stack:
17+
hide-dependency-versions: true
18+
supported-build: true
19+
developer-mode: true
20+
21+
ghc-options:
22+
"$locals": -fhide-source-paths
23+
24+
extra-deps:
25+
- pantry-0.4.0.2@rev:0
26+
27+
drop-packages:
28+
# See https://github.com/commercialhaskell/stack/pull/4712
29+
- cabal-install

0 commit comments

Comments
 (0)