git.iko.soy/jsaddle
on master help sign in
travis fixes
commit08ebaa7a5b47149c366527afad7121627879f4a5 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSun 16 Oct 2016, 11:32 (10 years ago) parent7c3dc97
3 files changed+16−3
compare with master
unifiedsplit
.travis.yml+2−2 travis/build.sh+3−1 travis/trusty.Dockerfile+11
.travis.yml+2−2
@@ -10,8 +10,8 @@ cache:
1010env:
1111 - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial
1212 - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial
13− - CABALVER=1.24 GHCVER=7.10.3 OSVER=wily
14− - CABALVER=1.24 GHCVER=8.0.1 OSVER=wily
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+3−1
@@ -4,6 +4,8 @@ echo $PATH
44export LC_ALL=C.UTF-8
55GHCVER=`ghc --numeric-version`
66
7+JSADDLE_VERSION=`head -n2 jsaddle.cabal | tail -n1 | sed 's/[^0-9.]//g'`
8+
79if [[ -d .cabal && -d .ghc ]]; then
810 cp -a .cabal .ghc /root
911fi
@@ -12,7 +14,7 @@ npm install ws
1214
1315cabal update
1416cabal 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
1618
1719# update the cache
1820rm -rf .cabal
travis/trusty.Dockerfilenew file+11
@@ -0,0 +1,11 @@
1+FROM ubuntu:trusty
2+
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
8+
9+RUN mkdir /build
10+WORKDIR /build
11+