on master help sign in
Add back --constraint='Cabal>=1.24.2.0' for travis
commitf446802e11179043325d0c4bb943a5e72949a886 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateThu 29 Dec 2016, 22:29 (10 years ago) parent9a80e98
2 files changed+5−5
.travis.yml+4−4 travis/build.sh+1−1
.travis.yml+4−4
@@ -8,10 +8,10 @@ cache:
88 - .ghc
99
1010env:
11−# - CABALVER=head GHCVER=7.10.3 OSVER=xenial
12− - CABALVER=head GHCVER=8.0.1 OSVER=xenial
13− - CABALVER=head GHCVER=7.10.3 OSVER=trusty
14− - CABALVER=head GHCVER=8.0.1 OSVER=trusty
11+# - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial
12+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial
13+ - CABALVER=1.24 GHCVER=7.10.3 OSVER=trusty
14+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=trusty
1515
1616before_install:
1717 - docker build -t ghc -f travis/$OSVER.Dockerfile travis
travis/build.sh+1−1
@@ -13,7 +13,7 @@ fi
1313npm install ws
1414
1515cabal update
16−cabal new-build 'jsaddle-warp:lib:jsaddle-warp' 'jsaddle-warp:test:test-tool'
16+cabal new-build --constraint='Cabal>=1.24.2.0' 'jsaddle-warp:lib:jsaddle-warp' 'jsaddle-warp:test:test-tool'
1717GHC_PACKAGE_PATH=/opt/ghc/$GHCVER/lib/ghc-$GHCVER/package.conf.d:~/.cabal/store/ghc-$GHCVER/package.db:./dist-newstyle/packagedb/ghc-$GHCVER jsaddle_datadir=`pwd` ./dist-newstyle/build/jsaddle-warp-$JSADDLE_WARP_VERSION/build/test-tool/test-tool .
1818
1919# update the cache