From 65be23fe90c2d429c3d16c5731b66df85849d2cd Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias <e+git@x80.org>
Date: Tue, 30 Jun 2020 13:32:57 +0200
Subject: [PATCH] [ci] Test with OCaml trunk / beta

We may want to have some of these tests `allow_failure`.

Fixes #2298

Signed-off-by: Emilio Jesus Gallego Arias <e+git@x80.org>
---
 .travis-ci.sh | 10 +++++-----
 .travis.yml   | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.travis-ci.sh b/.travis-ci.sh
index ace12a98cb75..32d7b1ce1b67 100755
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -54,19 +54,19 @@ fi
 case "$TARGET" in
   prepare)
     echo -en "travis_fold:start:ocaml\r"
-    if [ ! -e ~/ocaml/cached-version -o "$(cat ~/ocaml/cached-version)" != "$OCAML_VERSION.$OCAML_RELEASE" ] ; then
+    if [ ! -e ~/ocaml/cached-version -o "$(cat ~/ocaml/cached-version)" != "${OCAML_VERSION}${OCAML_RELEASE}" ] ; then
       rm -rf ~/ocaml
       mkdir -p ~/ocaml/src
       cd ~/ocaml/src
-      wget http://caml.inria.fr/pub/distrib/ocaml-$OCAML_VERSION/ocaml-$OCAML_VERSION.$OCAML_RELEASE.tar.gz
-      tar -xzf ocaml-$OCAML_VERSION.$OCAML_RELEASE.tar.gz
-      cd ocaml-$OCAML_VERSION.$OCAML_RELEASE
+      wget https://github.com/ocaml/ocaml/archive/${OCAML_VERSION}${OCAML_RELEASE}.tar.gz
+      tar -xzf ocaml-${OCAML_VERSION}${OCAML_RELEASE}.tar.gz
+      cd ocaml-${OCAML_VERSION}${OCAML_RELEASE}
       ./configure -prefix ~/ocaml
       make world.opt
       make install
       cd ../..
       rm -rf src
-      echo "$OCAML_VERSION.$OCAML_RELEASE" > ~/ocaml/cached-version
+      echo "${OCAML_VERSION}${OCAML_RELEASE}" > ~/ocaml/cached-version
     fi
     echo -en "travis_fold:end:ocaml\r"
     if [ $WITH_OPAM -eq 1 -o $OLD_OCAML -eq 1 ] ; then
diff --git a/.travis.yml b/.travis.yml
index 1c7d23cdf356..c739446d8c8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,24 +15,30 @@ script: bash -ex .travis-ci.sh build
 matrix:
   include:
   - os: linux
-    env: OCAML_VERSION=4.02 OCAML_RELEASE=3 WITH_OPAM=0
+    env: OCAML_VERSION=4.02 OCAML_RELEASE=.3 WITH_OPAM=0
     stage: Build
   - os: linux
-    env: OCAML_VERSION=4.08 OCAML_RELEASE=1 WITH_OPAM=0
+    env: OCAML_VERSION=4.08 OCAML_RELEASE=.1 WITH_OPAM=0
     stage: Build
   - os: linux
-    env: OCAML_VERSION=4.09 OCAML_RELEASE=0 WITH_OPAM=0
+    env: OCAML_VERSION=4.09 OCAML_RELEASE=.0 WITH_OPAM=0
     stage: Build
   - os: linux
-    env: OCAML_VERSION=4.10 OCAML_RELEASE=0 WITH_OPAM=0
+    env: OCAML_VERSION=4.10 OCAML_RELEASE=.0 WITH_OPAM=0
     stage: Build
   - os: linux
-    env: OCAML_VERSION=4.10 OCAML_RELEASE=0 WITH_OPAM=1
+    env: OCAML_VERSION=4.11 OCAML_RELEASE= WITH_OPAM=0
+    stage: Build
+  - os: linux
+    env: OCAML_VERSION=trunk OCAML_RELEASE= WITH_OPAM=0
+    stage: Build
+  - os: linux
+    env: OCAML_VERSION=4.10 OCAML_RELEASE=.0 WITH_OPAM=1
     stage: Test
     addons:
       apt:
         packages:
         - aspcud
   - os: osx
-    env: OCAML_VERSION=4.10 OCAML_RELEASE=0 WITH_OPAM=0
+    env: OCAML_VERSION=4.10 OCAML_RELEASE=.0 WITH_OPAM=0
     stage: Build_macOS