f446802 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

Add back --constraint='Cabal>=1.24.2.0' for travis

f446802Hamish Mackenzie10 years ago

.travis.yml+4−4

compare with master

unifiedsplit

@@ -8,10 +8,10 @@ cache:

8 - .ghc

10env:

11−# - CABALVER=head GHCVER=7.10.3 OSVER=xenial

11+# - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial

12− - CABALVER=head GHCVER=8.0.1 OSVER=xenial

12+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial

13− - CABALVER=head GHCVER=7.10.3 OSVER=trusty

13+ - CABALVER=1.24 GHCVER=7.10.3 OSVER=trusty

14− - CABALVER=head GHCVER=8.0.1 OSVER=trusty

14+ - CABALVER=1.24 GHCVER=8.0.1 OSVER=trusty

16before_install:

17 - docker build -t ghc -f travis/$OSVER.Dockerfile travis

travis/build.sh+1−1

@@ -13,7 +13,7 @@ fi

13npm install ws

15cabal 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'

17GHC_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 .

19# update the cache