Skip to content

Commit 9e2d4b4

Browse files
committed
[ travis ] Removed outdated code.
Issue commercialhaskell/stack#595 was fixed in stack 1.6.1.
1 parent c72cd02 commit 9e2d4b4

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

.travis.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ matrix:
6969
sources:
7070
- hvr-ghc
7171

72-
- env: TEST=STACKAGE GHC_VER=8.0.2 BUILD=STACK ARGS="--stack-yaml stack-8.0.2.yaml --system-ghc" MANUAL_INSTALL_BUILD_TOOLS=NO
72+
- env: TEST=STACKAGE GHC_VER=8.0.2 BUILD=STACK ARGS="--stack-yaml stack-8.0.2.yaml --system-ghc"
7373
addons:
7474
apt:
7575
packages:
7676
- ghc-8.0.2
7777
sources:
7878
- hvr-ghc
7979

80-
- env: TEST=STACKAGE GHC_VER=7.10.3 BUILD=STACK ARGS="--stack-yaml stack-7.10.3.yaml --system-ghc" MANUAL_INSTALL_BUILD_TOOLS=YES
80+
- env: TEST=STACKAGE GHC_VER=7.10.3 BUILD=STACK ARGS="--stack-yaml stack-7.10.3.yaml --system-ghc"
8181
addons:
8282
apt:
8383
packages:
@@ -180,13 +180,6 @@ install:
180180

181181
# TODO (2016-02-21): Split the long lines (`\` doesn't work).
182182

183-
# We have to manually install `alex`, `cpphs` and possibly `happy`
184-
# for older snapshots because `stack` seems to have trouble installing
185-
# build tools for those snapshots. Note that the version of `cpphs`
186-
# is currently specified in the yaml files.
187-
#
188-
# See https://github.com/commercialhaskell/stack/issues/595.
189-
190183
# N.B. that we use the `--force-reinstalls` option [Issue 1520].
191184

192185
# We are using `make CABAL_OPTS...` because we are including the
@@ -195,10 +188,7 @@ install:
195188
travis_retry cabal fetch `cabal install --dependencies-only --force-reinstalls --dry-run | sed 1,2d | sed "s|(latest[^)]*)||g"` &&
196189
make CABAL_OPTS='--only-dependencies --force-reinstalls' install-bin;
197190
elif [[ $TEST = "STACKAGE" ]]; then
198-
if [[ $MANUAL_INSTALL_BUILD_TOOLS = "YES" ]]; then
199-
stack install $ARGS --no-terminal alex cpphs happy;
200-
fi;
201-
stack build $ARGS --no-terminal --only-dependencies;
191+
stack build $ARGS --no-terminal --only-dependencies;
202192
fi
203193

204194
##############################################################################

0 commit comments

Comments
 (0)