Skip to content

Commit a23db28

Browse files
committed
Remove the cabal path
Was causing CI build failure due to missing BUILD env var for nightly pipelines.
1 parent 793484f commit a23db28

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

.azure/azure-linux-template.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,6 @@ jobs:
3636
./etc/scripts/get-hlint.sh
3737
export PATH="$(pwd)"/hlint:$PATH
3838
;;
39-
cabal)
40-
sudo add-apt-repository -y ppa:hvr/ghc
41-
sudo apt-get update
42-
sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
43-
# See note here: https://github.com/haskell-CI/haskell-ci#alex--happy-with-ghc--78
44-
if [ "$GHCVER" = "head" ] || [ "${GHCVER%.*}" = "7.8" ] || [ "${GHCVER%.*}" = "7.10" ]; then
45-
sudo apt-get install happy-1.19.4 alex-3.1.3
46-
export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
47-
else
48-
sudo apt-get install happy alex
49-
fi
50-
export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
51-
cabal --version
52-
cabal update
53-
PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
54-
cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
55-
;;
5639
*)
5740
export PATH=$HOME/.local/bin:$PATH
5841
stack --install-ghc $ARGS test --bench --only-dependencies

etc/scripts/ci-setup.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,3 @@ if [ `uname` = "Darwin" ]; then
2323
else
2424
travis_retry fetch_stack_linux
2525
fi
26-
27-
case "$BUILD" in
28-
stack)
29-
# However, we only need stack to download GHC for stack builds.
30-
travis_retry stack --no-terminal setup;
31-
;;
32-
cabal)
33-
mkdir -p $HOME/.cabal
34-
cat > $HOME/.cabal/config <<EOF
35-
remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/
36-
remote-repo-cache: $HOME/.cabal/packages
37-
jobs: \$ncpus
38-
EOF
39-
;;
40-
esac

0 commit comments

Comments
 (0)