Travis: use pvp-bounds when building with cabal-install (commercialhaskell#1450)

borsboom · borsboom · commit ce3e93f1a7f9 · 2015-11-29T13:37:18.000-08:00
diff --git a/.travis-setup.sh b/.travis-setup.sh
@@ -2,15 +2,17 @@
 
 set -eux
 
+mkdir -p ~/.local/bin;
+if [ `uname` = "Darwin" ]; then
+  curl -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
+else
+  curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack';
+fi;
+stack --no-terminal setup;
+
 case "$BUILD" in
   stack)
-    mkdir -p ~/.local/bin;
-    if [ `uname` = "Darwin" ]; then
-      curl -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
-    else
-      curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack';
-    fi
-    stack --no-terminal setup;;
+    ;;
   cabal)
 mkdir -p $HOME/.cabal
 cat > $HOME/.cabal/config <<EOF
diff --git a/.travis.yml b/.travis.yml
@@ -74,7 +74,10 @@ install:
      cabal)
        cabal --version;
        travis_retry cabal update;
-       cabal install --only-dependencies --constraint="ignore +without-pcre" --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0;;
+       rm -f $(stack path --dist-dir)/stack-*.tar.gz;
+       stack sdist --pvp-bounds=both;
+       tar xf $(stack 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;;
    esac
 
 script:
