@@ -80,16 +80,17 @@ before_install:
80# We want to always allow newer versions of packages when building on GHC HEAD
80# We want to always allow newer versions of packages when building on GHC HEAD
81- CABALARGS=""
81- CABALARGS=""
82- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
82- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
84−# Download and unpack the stack executable
85- export PATH=$PATH:/opt/happy/1.19.5/bin/:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin
83- export PATH=$PATH:/opt/happy/1.19.5/bin/:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin
86−- mkdir -p ~/.local/bin
84+# Download and unpack the stack executable
86+ if [[ $BUILD == "stack" ]]; then
87+ mkdir -p ~/.local/bin
88− if [ `uname` = "Darwin" ]
88+ if [ `uname` = "Darwin" ]
90− curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
90+ curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
92− curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
92+ curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'