From e9477ff06f4c3e2edbda22d30bf6360e2301220b Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 3 Jul 2017 15:45:14 -0400 Subject: Clean up .travis.yml It's more readable now --- .travis.yml | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 34e1cb45f..091fd5200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,31 +2,20 @@ language: generic sudo: required +dist: trusty + matrix: fast_finish: true include: - - dist: trusty - env: COQ_VERSION="trunk" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-trunk-daily" TARGETS="coq" - - dist: trusty - env: COQ_VERSION="v8.6" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-8.6-daily" TARGETS="no-curves-proofs" - - dist: trusty - env: COQ_VERSION="v8.5" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-8.5-daily" TARGETS="lite" - - dist: trusty - env: COQ_VERSION="8.6" COQ_PACKAGE="coq-8.6" COQPRIME="coqprime" PPA="ppa:jgross-h/many-coq-versions" TARGETS="no-curves-proofs" - - dist: trusty - env: TARGETS="printlite lite" COQ_VERSION="8.6" COQ_PACKAGE="coq-8.6" COQPRIME="coqprime" PPA="ppa:jgross-h/many-coq-versions" -# - dist: trusty -# env: COQ_VERSION="8.5pl3" COQ_PACKAGE="coq-8.5pl3 libcoq-ocaml-8.5pl3" COQPRIME="coqprime" PPA="ppa:jgross-h/many-coq-versions" -# - dist: trusty -# env: COQ_VERSION="8.5" COQ_PACKAGE="coq-8.5" COQPRIME="coqprime" PPA="ppa:jgross-h/many-coq-versions" -# - dist: precise -# env: COQ_VERSION="8.4pl6" COQ_PACKAGE="coq-8.4pl6 libcoq-ocaml-8.4pl6" COQPRIME="coqprime-8.4" PPA="ppa:jgross-h/many-coq-versions-ocaml-3" -# - dist: trusty -# env: COQ_VERSION="8.4" COQ_PACKAGE="coq" COQPRIME="coqprime-8.4" PPA="" + - env: COQ_VERSION="trunk" TARGETS="coq" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-trunk-daily" + - env: COQ_VERSION="v8.6" TARGETS="no-curves-proofs" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-8.6-daily" + - env: COQ_VERSION="v8.5" TARGETS="lite" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-8.5-daily" + - env: COQ_VERSION="8.6" TARGETS="no-curves-proofs" COQ_PACKAGE="coq-8.6" PPA="ppa:jgross-h/many-coq-versions" + - env: TARGETS="printlite lite" COQ_VERSION="8.6" COQ_PACKAGE="coq-8.6" PPA="ppa:jgross-h/many-coq-versions" allow_failures: - - env: COQ_VERSION="v8.5" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-8.5-daily" TARGETS="lite" - - env: COQ_VERSION="v8.6" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-8.6-daily" TARGETS="no-curves-proofs" - - env: COQ_VERSION="trunk" COQ_PACKAGE="coq" COQPRIME="coqprime" PPA="ppa:jgross-h/coq-trunk-daily" TARGETS="coq" + - env: COQ_VERSION="v8.5" TARGETS="lite" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-8.5-daily" + - env: COQ_VERSION="v8.6" TARGETS="no-curves-proofs" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-8.6-daily" + - env: COQ_VERSION="trunk" TARGETS="coq" COQ_PACKAGE="coq" PPA="ppa:jgross-h/coq-trunk-daily" before_install: - if [ ! -z "$PPA" ]; then sudo add-apt-repository "$PPA" -y; fi @@ -38,7 +27,7 @@ before_script: - uname -a - source ./etc/ci/travis_keep_alive.sh -script: COQPATH="$(pwd)/$COQPRIME" ./etc/coq-scripts/timing/make-pretty-timed.sh -j2 $TARGETS && make COQPATH="$(pwd)/$COQPRIME" $TARGETS TIMED=1 -j2 +script: COQPATH="$(pwd)/$COQPRIME" ./etc/coq-scripts/timing/make-pretty-timed.sh -j2 $TARGETS && make COQPATH="$(pwd)/coqprime" $TARGETS TIMED=1 -j2 after_success: - kill $PID_KEEP_ALIVE -- cgit v1.2.3