@@ -14,11 +14,13 @@ cache:
1414
1515matrix:
1616 include:
17− - env: CACHE_NAME=7.10.3 STACK_YAML=stack.ghc7.10.yaml
17+ - env: CACHE_NAME=7.10.3 STACK_YAML=stack.ghc7.10.yaml GHC_VERSION=7.10.3
1818 compiler: ": #stack 7.10.3"
19+ addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
1920
20− - env: CACHE_NAME=8.0.2 STACK_YAML=stack.yaml
21+ - env: CACHE_NAME=8.0.2 STACK_YAML=stack.yaml GHC_VERSION=8.0.2
2122 compiler: ": #stack 8.0.2"
23+ addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
2224
2325 - env: CACHE_NAME=osx-7.10.3 STACK_YAML=stack.ghc7.10.yaml
2426 os: osx
@@ -30,11 +32,9 @@ matrix:
3032
3133install:
3234 - unset CC
33− - export PATH=$HOME/.local/bin:$PATH
35+ - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
3436 - ./.travis/install-ghr.sh
3537 - ./.travis/install-stack.sh
36− - travis_wait travis_retry stack setup
37− - travis_retry stack build --only-dependencies
3838
3939# Here starts the actual work to be performed for the package under test;
4040# any command which exits with a non-zero exit code causes the build to fail.
@@ -43,7 +43,11 @@ script:
4343 - |
4444 set -ex
4545 # Run tests
46− stack --no-terminal test --ghc-options="$GHC_OPTIONS"
46+ if [ "$(uname)" = "Darwin" ]; then
47+ stack --install-ghc --no-terminal test --ghc-options="$GHC_OPTIONS"
48+ else
49+ stack --no-install-ghc --system-ghc --no-terminal test --ghc-options="$GHC_OPTIONS"
50+ fi
4751 set +ex
4852
4953after_success: