aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2018-05-10 11:50:43 +0200
committerGravatar Emilio Jesus Gallego Arias <e+git@x80.org>2018-05-10 11:50:43 +0200
commit45171b6e34f01392dabee285f616f3f6f4217e98 (patch)
tree17f7ab4c276678b608477e35709088fba0c6379f
parent372737ba74baa2af8ee798df1b2768a5d827a179 (diff)
parent42c6b8f3b13cc5e974a129fe81481e64c9a8a182 (diff)
Merge PR #7471: [travis] Fix version of camlp5 for OCaml 4.06.1.
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index eeb0b800e..08b255cdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ env:
- COMPILER="system"
- COMPILER_BE="4.06.1"
- CAMLP5_VER=".6.14"
- - CAMLP5_VER_BE=".7.03"
+ - CAMLP5_VER_BE=".7.05"
- FINDLIB_VER=".1.4.1"
- FINDLIB_VER_BE=".1.8.0"
- LABLGTK="lablgtk.2.18.3 lablgtk-extras.1.6"
@@ -278,6 +278,7 @@ install:
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then travis_retry ./dev/tools/sudo-apt-get-update.sh -q; fi
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get install -y opam aspcud gcc-multilib; fi
- opam init -j ${NJOBS} --compiler=${COMPILER} -n -y
+- opam switch "$COMPILER" && opam update
- eval $(opam config env)
- opam config list
- opam install -j ${NJOBS} -y num camlp5${CAMLP5_VER} ocamlfind${FINDLIB_VER} ${EXTRA_OPAM}