08ebaa7 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

travis fixes

08ebaa7Hamish Mackenzie10 years ago

.travis.yml+2−2

compare with master

unifiedsplit

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

10env:

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=wily

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

14− - CABALVER=1.24 GHCVER=8.0.1 OSVER=wily

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+3−1

@@ -4,6 +4,8 @@ echo $PATH

4export LC_ALL=C.UTF-8

5GHCVER=`ghc --numeric-version`

7+JSADDLE_VERSION=`head -n2 jsaddle.cabal | tail -n1 | sed 's/[^0-9.]//g'`

7if [[ -d .cabal && -d .ghc ]]; then

9if [[ -d .cabal && -d .ghc ]]; then

8 cp -a .cabal .ghc /root

10 cp -a .cabal .ghc /root

9fi

11fi

@@ -12,7 +14,7 @@ npm install ws

13cabal update

15cabal update

14cabal new-build 'jsaddle:lib:jsaddle' 'jsaddle:test:test-tool'

16cabal new-build 'jsaddle:lib:jsaddle' 'jsaddle:test:test-tool'

15−GHC_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-0.5.0.0/build/test-tool/test-tool

17+GHC_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-$JSADDLE_VERSION/build/test-tool/test-tool

17# update the cache

19# update the cache

18rm -rf .cabal

20rm -rf .cabal

travis/trusty.Dockerfilenew file+11

@@ -0,0 +1,11 @@

1+FROM ubuntu:trusty

3+RUN apt-get update && \

4+ apt-get -y install software-properties-common && \

5+ add-apt-repository -y ppa:hvr/ghc && \

6+ apt-get update && \

7+ apt-get -y install happy-1.19.5 alex-3.1.7 nodejs npm

9+RUN mkdir /build

10+WORKDIR /build

11+