aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 224dfe2f5..e40568995 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,8 +94,8 @@ matrix:
- env:
- TEST_TARGET="test-suite"
- - COMPILER="4.04.1"
- - CAMLP5_VER="6.17"
+ - COMPILER="4.05.0"
+ - CAMLP5_VER="7.01"
- EXTRA_CONF="-coqide opt -with-doc yes"
- EXTRA_OPAM="lablgtk-extras hevea"
addons:
@@ -123,8 +123,8 @@ matrix:
- env:
- TEST_TARGET="coqocaml"
- - COMPILER="4.04.1"
- - CAMLP5_VER="6.17"
+ - COMPILER="4.05.0"
+ - CAMLP5_VER="7.01"
- EXTRA_CONF="-coqide opt -warn-error"
- EXTRA_OPAM="lablgtk-extras hevea"
# dummy target
@@ -138,12 +138,15 @@ matrix:
- os: osx
env:
- TEST_TARGET="test-suite"
- - COMPILER="system"
- - CAMLP5_VER="6.17"
+ - COMPILER="4.02.3"
- NATIVE_COMP="no"
before_install:
- brew update
- brew install opam
+ - brew install gnu-time
+
+before_install:
+- if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then echo "Tested commit (followed by parent commits):"; git log -1; for commit in `git log -1 --format="%P"`; do echo; git log -1 $commit; done; fi
install:
- opam init -j ${NJOBS} --compiler=${COMPILER} -n -y