From e1fd981dfc80da6c4197ea353c8215d15676860e Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 28 Feb 2018 10:36:46 +0100
Subject: tavis: make the . in pkg.version part of $VERSION

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4f01d2f02..babbbbccdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,10 +40,10 @@ env:
   # system is == 4.02.3
   - COMPILER="system"
   - COMPILER_BE="4.06.0"
-  - CAMLP5_VER="6.14"
-  - CAMLP5_VER_BE="7.03"
-  - FINDLIB_VER="1.4.1"
-  - FINDLIB_VER_BE="1.7.3"
+  - CAMLP5_VER=".6.14"
+  - CAMLP5_VER_BE=".7.03"
+  - FINDLIB_VER=".1.4.1"
+  - FINDLIB_VER_BE=".1.7.3"
   - LABLGTK="lablgtk.2.18.3 lablgtk-extras.1.6"
   - LABLGTK_BE="lablgtk.2.18.6 lablgtk-extras.1.6"
   - NATIVE_COMP="yes"
@@ -221,7 +221,7 @@ matrix:
       env:
       - TEST_TARGET="test-suite"
       - COMPILER="4.02.3"
-      - CAMLP5_VER="6.17"
+      - CAMLP5_VER=".6.17"
       - NATIVE_COMP="no"
       - COQ_DEST="-local"
       before_install:
@@ -234,7 +234,7 @@ matrix:
       env:
       - TEST_TARGET=""
       - COMPILER="4.02.3"
-      - CAMLP5_VER="6.17"
+      - CAMLP5_VER=".6.17"
       - NATIVE_COMP="no"
       - COQ_DEST="-prefix ${PWD}/_install"
       - EXTRA_CONF="-coqide opt -warn-error"
@@ -264,7 +264,7 @@ install:
 - opam init -j ${NJOBS} --compiler=${COMPILER} -n -y
 - eval $(opam config env)
 - opam config list
-- opam install -j ${NJOBS} -y camlp5.${CAMLP5_VER} ocamlfind.${FINDLIB_VER} ${EXTRA_OPAM}
+- opam install -j ${NJOBS} -y camlp5${CAMLP5_VER} ocamlfind${FINDLIB_VER} ${EXTRA_OPAM}
 - opam list
 
 script:
-- 
cgit v1.2.3


From 4908922de3a4c1af3a3368598a65699822212815 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Tue, 27 Feb 2018 18:33:18 +0100
Subject: travis: elpi needs findlib >= 1.5

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index babbbbccdc..9ec936b0c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,8 @@ matrix:
       - TEST_TARGET="ci-coquelicot"
     - if: NOT (type = pull_request)
       env:
+      # ppx_tools_versioned requires a specific version findlib
+      - FINDLIB_VER=""
       - TEST_TARGET="ci-elpi" EXTRA_OPAM="ppx_tools_versioned ppx_deriving ocaml-migrate-parsetree"
     - if: NOT (type = pull_request)
       env:
-- 
cgit v1.2.3