Skip to content

Commit ff2f502

Browse files
borsboomborsboom
committed
.travis.yml: restore building with ghc-8.0.1
1 parent 4ee027d commit ff2f502

2 files changed

Lines changed: 54 additions & 19 deletions

File tree

‎.travis.yml‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ matrix:
2323
compiler: ": #GHC 7.10.3"
2424
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
2525

26+
- env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.1
27+
compiler: ": #GHC 8.0.1"
28+
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
29+
2630
- env: BUILD=stack STACK_YAML=stack.yaml
2731
compiler: ": #stack 7.10.3"
2832
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
@@ -31,34 +35,45 @@ matrix:
3135
compiler: ": #stack 7.10.3 osx"
3236
os: osx
3337

34-
allow_failures:
38+
- env: BUILD=stack GHCVER=8.0.1 STACK_YAML=stack-8.0.1.yaml
39+
compiler: ": #stack 8.0.1"
40+
addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}}
3541

36-
# Temporarily allow 8.0.2 to fail, because 'store-0.3' triggers excessive memory use
37-
- env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
38-
compiler: ": #GHC 8.0.2"
39-
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
42+
- env: BUILD=stack GHCVER=8.0.1 STACK_YAML=stack-8.0.1.yaml
43+
compiler: ": #stack 8.0.1 osx"
44+
os: osx
4045

41-
# Temporarily allow 8.0.2 to fail, because 'store-0.3' triggers excessive memory use
42-
- env: BUILD=stack GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
43-
compiler: ": #stack 8.0.2"
44-
addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
46+
- env: BUILD=style GHCVER=8.0.1 STACK_YAML=stack-8.0.1.yaml
47+
compiler: ": #stack 8.0.1"
48+
addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}}
4549

46-
# Temporarily allow 8.0.2 to fail, because 'store-0.3' triggers excessive memory use
47-
- env: BUILD=stack GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
48-
compiler: ": #stack 8.0.2 osx"
49-
os: osx
50+
## Temporarily remove 8.0.2, because 'store-0.3' triggers excessive memory use
51+
#- env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
52+
# compiler: ": #GHC 8.0.2"
53+
# addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
5054

51-
# Temporarily allow 8.0.2 to fail, because 'store-0.3' triggers excessive memory use
52-
- env: BUILD=style GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
53-
compiler: ": #stack 8.0.2"
54-
addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
55+
## Temporarily remove 8.0.2, because 'store-0.3' triggers excessive memory use
56+
#- env: BUILD=stack GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
57+
# compiler: ": #stack 8.0.2"
58+
# addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
5559

60+
## Temporarily remove 8.0.2, because 'store-0.3' triggers excessive memory use
61+
#- env: BUILD=stack GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
62+
# compiler: ": #stack 8.0.2 osx"
63+
# os: osx
64+
65+
## Temporarily remove 8.0.2, because 'store-0.3' triggers excessive memory use
66+
#- env: BUILD=style GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
67+
# compiler: ": #stack 8.0.2"
68+
# addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
69+
70+
allow_failures:
5671
- env: BUILD=stack STACK_YAML=stack.yaml
5772
compiler: ": #stack 7.10.3 osx"
5873
os: osx
5974

60-
- env: BUILD=stack GHCVER=8.0.2 STACK_YAML=stack-8.0.yaml
61-
compiler: ": #stack 8.0.2 osx"
75+
- env: BUILD=stack GHCVER=8.0.1 STACK_YAML=stack-8.0.1.yaml
76+
compiler: ": #stack 8.0.1 osx"
6277
os: osx
6378

6479
# Note: the distinction between `before_install` and `install` is not important.

‎stack-8.0.1.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
resolver: lts-7.19
2+
image:
3+
containers:
4+
- base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile
5+
name: "fpco/stack-test"
6+
nix:
7+
# --nix on the command-line to enable.
8+
enable: false
9+
packages:
10+
- zlib
11+
extra-deps:
12+
- http-client-0.5.3.3
13+
- http-conduit-2.2.3
14+
- http-client-tls-0.3.3
15+
- optparse-applicative-0.13.0.0
16+
- pid1-0.1.0.0
17+
- store-0.3
18+
- store-core-0.3
19+
- hpack-0.17.0
20+
- aeson-1.0.2.1

0 commit comments

Comments
 (0)