From 2c13810b841ee0d579b5cb4a7dd60365f03c9718 Mon Sep 17 00:00:00 2001 From: odanoburu Date: Wed, 8 Aug 2018 23:51:34 -0300 Subject: [PATCH 1/6] (#4) travis build with docker image using dockerfile in https://github.com/odanoburu/docker-gf/blob/master/haskell-gf/Dockerfile --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8501e825..74431e795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ -os: osx +sudo: required + language: c -install: - - mkdir bin +services: + - docker + +before_install: + - docker pull odanoburu/haskell-gf:3.9 - mkdir rgl - - curl http://www.grammaticalframework.org/download/gf-3.9-bin-intel-mac.tar.gz > gf.tar.gz - - tar -C bin -zxf gf.tar.gz script: - - sh Make.sh --gf=./bin/gf --dest=./rgl + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build --langs=-Mon --dest=rgl ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; sh Make.sh --dest=rgl ;" From d377a0045b1d9ba82b67725762117fc4336f41e2 Mon Sep 17 00:00:00 2001 From: odanoburu Date: Wed, 8 Aug 2018 23:59:00 -0300 Subject: [PATCH 2/6] change order --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74431e795..614729179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: - mkdir rgl script: - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build --langs=-Mon --dest=rgl ;" - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; sh Make.sh --dest=rgl ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build --langs=-Mon --dest=rgl ;" From 5dff7e914ad159d2442acdad202502826c7ac9c3 Mon Sep 17 00:00:00 2001 From: odanoburu Date: Thu, 9 Aug 2018 00:10:25 -0300 Subject: [PATCH 3/6] (#4) reverse order, use GF_LIB_PATH --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 614729179..46554d14d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: - mkdir rgl script: - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; sh Make.sh --dest=rgl ;" - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build --langs=-Mon --dest=rgl ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; runghc Make.hs build --langs=-Mon --dest=rgl ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl ;" From 5ce0ad5639758df065d6bca984c65c2ed595038b Mon Sep 17 00:00:00 2001 From: odanoburu Date: Thu, 9 Aug 2018 17:54:58 +0000 Subject: [PATCH 4/6] (#4) use --verbose in travis build build mongolian too rm --dest flag from haskell build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46554d14d..092420ce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: - mkdir rgl script: - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; runghc Make.hs build --langs=-Mon --dest=rgl ;" - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build all --verbose ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl --verbose ;" From c4f4df256bae47a21878ab003ad883c7226f7eef Mon Sep 17 00:00:00 2001 From: odanoburu Date: Thu, 9 Aug 2018 18:19:49 +0000 Subject: [PATCH 5/6] try using bash --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 092420ce9..0203e6be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: - mkdir rgl script: - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; runghc Make.hs build all --verbose ;" - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/sh -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl --verbose ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl ; runghc Make.hs build all --verbose ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl --verbose ;" From fe10e94c6cf77c2be10c1423461c177031aa5617 Mon Sep 17 00:00:00 2001 From: odanoburu Date: Fri, 10 Aug 2018 15:08:06 +0000 Subject: [PATCH 6/6] (#4) Make.hs build prelude all use bash to call Make.sh --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0203e6be4..7f2c3d435 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,5 @@ before_install: - mkdir rgl script: - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl ; runghc Make.hs build all --verbose ;" - - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl; sh Make.sh --dest=rgl --verbose ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl ; runghc Make.hs build prelude all --verbose ;" + - docker run --mount src="$(pwd)",target=/home,type=bind odanoburu/haskell-gf:3.9 /bin/bash -c "cd /home/; export GF_LIB_PATH=/home/rgl; bash Make.sh --dest=rgl --verbose ;"