@@ -44,18 +44,21 @@ matrix:
4444 # - env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
4545 # compiler: ": #GHC 7.4.2"
4646 # addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
47- - env : BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
48- compiler : " : #GHC 7.6.3"
49- addons : {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
50- - env : BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
51- compiler : " : #GHC 7.8.4"
52- addons : {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
47+ # - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
48+ # compiler: ": #GHC 7.6.3"
49+ # addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
50+ # - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
51+ # compiler: ": #GHC 7.8.4"
52+ # addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
5353 - env : BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
5454 compiler : " : #GHC 7.10.3"
5555 addons : {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
5656 - env : BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
5757 compiler : " : #GHC 8.0.2"
5858 addons : {apt: {packages: [cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
59+ - env : BUILD=cabal GHCVER=8.2.2 CABALVER=2.0 HAPPYVER=1.19.5 ALEXVER=3.1.7
60+ compiler : " : #GHC 8.2.2"
61+ addons : {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
5962
6063 # Build with the newest GHC and cabal-install. This is an accepted failure,
6164 # see below.
@@ -85,7 +88,7 @@ matrix:
8588 compiler : " : #stack 8.0.1"
8689 addons : {apt: {packages: [libgmp-dev]}}
8790
88- - env : BUILD=stack ARGS="--resolver lts-8 "
91+ - env : BUILD=stack ARGS="--resolver lts-9 "
8992 compiler : " : #stack 8.0.2"
9093 addons : {apt: {packages: [libgmp-dev]}}
9194
@@ -116,7 +119,7 @@ matrix:
116119 compiler : " : #stack 8.0.1 osx"
117120 os : osx
118121
119- - env : BUILD=stack ARGS="--resolver lts-8 "
122+ - env : BUILD=stack ARGS="--resolver lts-9 "
120123 compiler : " : #stack 8.0.2 osx"
121124 os : osx
122125
@@ -164,13 +167,21 @@ install:
164167 set -ex
165168 case "$BUILD" in
166169 stack)
170+ # Add in extra-deps for older snapshots, as necessary
171+ stack --no-terminal --install-ghc $ARGS test --bench --dry-run || ( \
172+ stack --no-terminal $ARGS build cabal-install && \
173+ stack --no-terminal $ARGS solver --update-config)
174+
175+ # Build the dependencies
167176 stack --no-terminal --install-ghc $ARGS test --bench --only-dependencies
168177 ;;
169178 cabal)
170179 cabal --version
171180 travis_retry cabal update
172181
173- # Get the list of packages from the stack.yaml file
182+ # Get the list of packages from the stack.yaml file. Note that
183+ # this will also implicitly run hpack as necessary to generate
184+ # the .cabal files needed by cabal-install.
174185 PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
175186
176187 cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
0 commit comments