From 91494bb2a7e958d88fb05cb871cef303f2d2c0b4 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:22:59 -0500 Subject: [PATCH 01/16] Make travis run the LaTeX test script as well --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1b5d76..28fde2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,6 @@ before_install: script: - chmod u+x script/test.sh + - chmod u+x script/test_latex.sh + - ./script/test_latex.sh - ./script/test.sh From 76b9122f64dc12afea387eb6dd599fd44cf13af4 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:23:17 -0500 Subject: [PATCH 02/16] Run xelatex with -halt-on-error --- script/test_latex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test_latex.sh b/script/test_latex.sh index d1f8865..a39fee5 100755 --- a/script/test_latex.sh +++ b/script/test_latex.sh @@ -1,2 +1,2 @@ rm -rf resources/out.tex -bash script/build.sh && echo "((A /\\ B) => (B /\\ A)) /\\ ((B /\\ A) => (A /\\ B))" | ./sequent --latex > resources/out.tex && cd resources && xelatex out.tex && open -a Preview out.pdf +bash script/build.sh && echo "((A /\\ B) => (B /\\ A)) /\\ ((B /\\ A) => (A /\\ B))" | ./sequent --latex > resources/out.tex && cd resources && xelatex -halt-on-error out.tex && open -a Preview out.pdf From 6b20093dbfc13e777004e8ffea1371438bd433c3 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:25:48 -0500 Subject: [PATCH 03/16] Switch to pdflatex --- script/test_latex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test_latex.sh b/script/test_latex.sh index a39fee5..88deda9 100755 --- a/script/test_latex.sh +++ b/script/test_latex.sh @@ -1,2 +1,2 @@ rm -rf resources/out.tex -bash script/build.sh && echo "((A /\\ B) => (B /\\ A)) /\\ ((B /\\ A) => (A /\\ B))" | ./sequent --latex > resources/out.tex && cd resources && xelatex -halt-on-error out.tex && open -a Preview out.pdf +bash script/build.sh && echo "((A /\\ B) => (B /\\ A)) /\\ ((B /\\ A) => (A /\\ B))" | ./sequent --latex > resources/out.tex && cd resources && pdflatex -halt-on-error out.tex && open -a Preview out.pdf From a5e79dcf97ad4b96e2e85c617ccfb8ae7299ef7c Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:27:06 -0500 Subject: [PATCH 04/16] Update travis to install TeX --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28fde2a..a2e2fa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base + script: - chmod u+x script/test.sh From 42bf55b722984e99a1ff3482903c12a1a6e8792f Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:33:30 -0500 Subject: [PATCH 05/16] Update build.sh so that it tries the linux architecture if darwin fails --- script/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build.sh b/script/build.sh index 4bbee40..166d15a 100755 --- a/script/build.sh +++ b/script/build.sh @@ -1,6 +1,6 @@ echo "OS.Process.exit OS.Process.failure" | sml -m src/main.cm if [ $? -eq 0 ]; then - printf 'sml @SMLload=sequent.x86-darwin $@\n' > sequent + printf 'sml @SMLload=sequent.x86-darwin $@ || sml @SMLload=sequent.x86-linux $@\n' > sequent chmod u+x sequent else printf "Could not compile.\n" From a1e8a399e59413438184cdca10313c1b9d87398f Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:36:58 -0500 Subject: [PATCH 06/16] Install texlive-full instead --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2e2fa4..6756c18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-full script: From e3bc17e554f0479cbfe6d32bc1b3d3e2a570243e Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:46:39 -0500 Subject: [PATCH 07/16] Try installing ebproof manually --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6756c18..566f1ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,13 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-full + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base + - tlmgr install ebproof + +addons: + apt: + packages: + - texlive-full script: From b3849db9a96111592adc6039143f410bde8204c1 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 22:52:09 -0500 Subject: [PATCH 08/16] Get rid of addons --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 566f1ca..cdfaa86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,6 @@ before_install: - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base - tlmgr install ebproof -addons: - apt: - packages: - - texlive-full - - script: - chmod u+x script/test.sh - chmod u+x script/test_latex.sh From 8f6b114c221d26235bcd2359a1629e688f72533c Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:03:25 -0500 Subject: [PATCH 09/16] Update travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdfaa86..2318957 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base - - tlmgr install ebproof + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-binaries + - which texlive script: - chmod u+x script/test.sh From c2ef3628681fd83b2fad93cc8345681b392f3425 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:05:28 -0500 Subject: [PATCH 10/16] Update travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2318957..5d99589 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required before_install: - sudo apt-get update -qq - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-binaries - - which texlive + - which pdflatex script: - chmod u+x script/test.sh From f2280203bbb707086661ab14dbf4051eea8d0355 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:12:46 -0500 Subject: [PATCH 11/16] Update travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d99589..24eb5ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-binaries + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-base - which pdflatex script: From d218c941c2026c31fc40b6ad13b0e8ef22326594 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:16:30 -0500 Subject: [PATCH 12/16] Update travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24eb5ec..9e984e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-base + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base - which pdflatex script: From cf08955f0f1e5db516fbced3061792535fae8a5e Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:21:27 -0500 Subject: [PATCH 13/16] Update travis --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e984e5..c5bb29d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,17 @@ sudo: required before_install: - sudo apt-get update -qq - - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex texlive-latex-base + - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex - which pdflatex +apt: + packages: + - texlive-xetex + - texlive-latex-extra + - texlive-fonts-recommended + - latex-xcolor + - lmodern + script: - chmod u+x script/test.sh - chmod u+x script/test_latex.sh From 5a577dd82418353ddc5e040b5ec50d48b201d086 Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:25:05 -0500 Subject: [PATCH 14/16] Update travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c5bb29d..6844c62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ before_install: apt: packages: + - texlive-full - texlive-xetex - texlive-latex-extra - texlive-fonts-recommended From 60e241bf20e74c82017ed177093aadb43750a0ff Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sat, 8 Jul 2017 23:28:53 -0500 Subject: [PATCH 15/16] Add the forgotten addons keyword --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6844c62..4775413 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,14 +8,15 @@ before_install: - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex - which pdflatex -apt: - packages: - - texlive-full - - texlive-xetex - - texlive-latex-extra - - texlive-fonts-recommended - - latex-xcolor - - lmodern +addons: + apt: + packages: + - texlive-full + - texlive-xetex + - texlive-latex-extra + - texlive-fonts-recommended + - latex-xcolor + - lmodern script: - chmod u+x script/test.sh From 41fbba2e77228463469e3a32d6dcae67ddb23b2e Mon Sep 17 00:00:00 2001 From: Ayberk Tosun Date: Sun, 9 Jul 2017 14:19:26 -0500 Subject: [PATCH 16/16] Try caching /usr/bin --- .travis.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4775413..23f2ef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,11 @@ sudo: required before_install: - sudo apt-get update -qq - sudo apt-get install -y --force-yes smlnj ml-yacc ml-lex ml-ulex - - which pdflatex + - which pdflatex || sudo apt-get install texlive-full texlive-latex-extra -addons: - apt: - packages: - - texlive-full - - texlive-xetex - - texlive-latex-extra - - texlive-fonts-recommended - - latex-xcolor - - lmodern +cache: + directories: + - /usr/bin script: - chmod u+x script/test.sh