Skip to content

Commit 64715d4

Browse files
authored
Merge pull request #631 from phadej/travis-ghc-8.4.2
Travis ghc 8.4.2
2 parents a9e7111 + 20679e7 commit 64715d4

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

.travis.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,29 @@ matrix:
2727
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
2828
- env: BUILD=stack CABALVER=2.0 GHCVER=8.2.2 STACK_YAML=stack-ffi-unescape.yaml
2929
compiler: ": #GHC 8.2.2"
30-
addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
30+
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
31+
32+
- env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.2
33+
compiler: ": #GHC 8.4.2"
34+
addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.2], sources: [hvr-ghc]}}
35+
- env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2
36+
compiler: ": #GHC 8.2.2"
37+
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
3138
- env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2
3239
compiler: ": #GHC 8.0.2"
3340
addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}
34-
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
35-
compiler: ": #GHC 7.4.2"
36-
addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
37-
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
38-
compiler: ": #GHC 7.6.3"
39-
addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
40-
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
41-
compiler: ": #GHC 7.8.4"
42-
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
4341
- env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
4442
compiler: ": #GHC 7.10.3"
4543
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
44+
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4
45+
compiler: ": #GHC 7.8.4"
46+
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
47+
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3
48+
compiler: ": #GHC 7.6.3"
49+
addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
50+
- env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2
51+
compiler: ": #GHC 7.4.2"
52+
addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
4653

4754
before_install:
4855
- unset CC

aeson.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ test-suite tests
185185
UnitTests.NullaryConstructors
186186

187187
build-depends:
188-
QuickCheck >= 2.10.0.1 && < 2.11,
188+
QuickCheck >= 2.10.0.1 && < 2.12,
189189
aeson,
190190
integer-logarithms >= 1 && <1.1,
191191
attoparsec,
192192
base,
193193
base-compat,
194-
base-orphans >= 0.5.3 && <0.7,
194+
base-orphans >= 0.5.3 && <0.8,
195195
base16-bytestring,
196196
containers,
197197
directory,

0 commit comments

Comments
 (0)