Fix the Travis build for Setup.hs

commercialhaskell · Jul 24, 2017 · 4fa8242 · 4fa8242
1 parent ccb8235
commit 4fa8242
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - env: BUILD=cabal CABALVER=1.24 GHCVER=7.10.3
+    - env: BUILD=cabal STACK_YAML=stack-7.10.yaml CABALVER=1.24 GHCVER=7.10.3
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.24,ghc-7.10.3], sources: [hvr-ghc]}}
 
@@ -31,7 +31,7 @@ matrix:
       compiler: ": #stack 7.10.3 osx"
       os: osx
 
-    - env: BUILD=cabal CABALVER=1.24 GHCVER=8.0.2
+    - env: BUILD=cabal STACK_YAML=stack.yaml CABALVER=1.24 GHCVER=8.0.2
       compiler: ": #GHC 8.0.2"
       addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
 
@@ -86,8 +86,9 @@ install:
        rm -f $HOME/.cabal/bin/stack;
        echo "stack is located at $(which stack)";
        stack --version;
-       rm -f $(stack --compiler=ghc-$GHCVER path --dist-dir)/stack-*.tar.gz &&
-       stack --system-ghc --compiler=ghc-$GHCVER sdist --pvp-bounds=both &&
+       rm -f $(stack --stack-yaml=$STACK_YAML path --dist-dir)/stack-*.tar.gz &&
+       stack --system-ghc --stack-yaml=$STACK_YAML build Cabal &&
+       stack --system-ghc --stack-yaml=$STACK_YAML sdist --pvp-bounds=both &&
        tar xf $(stack --system-ghc --compiler=ghc-$GHCVER path --dist-dir)/stack-*.tar.gz --wildcards --strip-components=1 '*/stack.cabal' &&
        cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1;;
    esac