From 238cfc64842f806fe62ce223254d6dbfa6435568 Mon Sep 17 00:00:00 2001
From: Enrico Tassi <Enrico.Tassi@Inria.fr>
Date: Wed, 11 Mar 2020 14:09:32 +0100
Subject: [PATCH 1/2] clenaup ci

---
 .travis.yml                                   | 23 +++++++++----------
 .../docker-install.sh                         |  0
 .../docker-test.sh                            |  0
 3 files changed, 11 insertions(+), 12 deletions(-)
 rename .travis.docker-install.sh => .travis/docker-install.sh (100%)
 rename .travis.docker-test.sh => .travis/docker-test.sh (100%)

diff --git a/.travis.yml b/.travis.yml
index a67d64401..658d2327a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,11 @@ branches:
   only:
   - master
 
+env:
+  global:
+  - NJOBS="2"
+  - CONTRIB_NAME="hb"
+
 jobs:
   include:
   - language: nix
@@ -23,13 +28,11 @@ jobs:
     services:
     - docker
     env:
-    - NJOBS="2"
-    - CONTRIB_NAME="hb"
     - COQ="coqorg/coq:8.10" ELPI="coq-elpi.1.3.0" CMD="make && make install"
     install:
-    - ./.travis.docker-install.sh
+    - ./.travis/docker-install.sh
     script:
-    - ./.travis.docker-test.sh
+    - ./.travis/docker-test.sh
     after_script:
     - docker stop COQ
 
@@ -38,13 +41,11 @@ jobs:
     services:
     - docker
     env:
-    - NJOBS="2"
-    - CONTRIB_NAME="hb"
     - COQ="coqorg/coq:8.11" ELPI="coq-elpi.1.3.1" CMD="make && make install"
     install:
-    - ./.travis.docker-install.sh
+    - ./.travis/docker-install.sh
     script:
-    - ./.travis.docker-test.sh
+    - ./.travis/docker-test.sh
     after_script:
     - docker stop COQ
 
@@ -53,12 +54,10 @@ jobs:
     services:
     - docker
     env:
-    - NJOBS="2"
-    - CONTRIB_NAME="hb"
     - COQ="coqorg/coq:8.11" ELPI="coq-elpi.1.3.1" CMD="opam pin add coq-hierarchy-builder . -y -v"
     install:
-    - ./.travis.docker-install.sh
+    - ./.travis/docker-install.sh
     script:
-    - ./.travis.docker-test.sh
+    - ./.travis/docker-test.sh
     after_script:
     - docker stop COQ
diff --git a/.travis.docker-install.sh b/.travis/docker-install.sh
similarity index 100%
rename from .travis.docker-install.sh
rename to .travis/docker-install.sh
diff --git a/.travis.docker-test.sh b/.travis/docker-test.sh
similarity index 100%
rename from .travis.docker-test.sh
rename to .travis/docker-test.sh

From 5291c38603715c194b85afb69b83f98568592a4a Mon Sep 17 00:00:00 2001
From: Enrico Tassi <Enrico.Tassi@Inria.fr>
Date: Wed, 11 Mar 2020 14:16:28 +0100
Subject: [PATCH 2/2] test against coq:dev and coq-elpi:coq-master

---
 .travis.yml               | 26 +++++++++++++++++++++-----
 .travis/docker-install.sh | 14 +++++++++-----
 .travis/docker-test.sh    |  3 +++
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 658d2327a..31b62b2be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,10 @@ branches:
 
 env:
   global:
-  - NJOBS="2"
-  - CONTRIB_NAME="hb"
+  - CONTRIB_NAME=hb
+  - ELPI_810=coq-elpi.1.3.0
+  - ELPI_811=coq-elpi.1.3.1
+  - ELPI_DEV=https://github.com/LPCIC/coq-elpi.git#coq-master
 
 jobs:
   include:
@@ -28,7 +30,7 @@ jobs:
     services:
     - docker
     env:
-    - COQ="coqorg/coq:8.10" ELPI="coq-elpi.1.3.0" CMD="make && make install"
+    - COQ=8.10 ELPI="install ${ELPI_810}" CMD="make && make install"
     install:
     - ./.travis/docker-install.sh
     script:
@@ -41,7 +43,7 @@ jobs:
     services:
     - docker
     env:
-    - COQ="coqorg/coq:8.11" ELPI="coq-elpi.1.3.1" CMD="make && make install"
+    - COQ=8.11 ELPI="install ${ELPI_811}" CMD="make && make install"
     install:
     - ./.travis/docker-install.sh
     script:
@@ -54,7 +56,21 @@ jobs:
     services:
     - docker
     env:
-    - COQ="coqorg/coq:8.11" ELPI="coq-elpi.1.3.1" CMD="opam pin add coq-hierarchy-builder . -y -v"
+    - COQ=8.11 ELPI="install ${ELPI_811}" CMD="opam pin add coq-hierarchy-builder ."
+    install:
+    - ./.travis/docker-install.sh
+    script:
+    - ./.travis/docker-test.sh
+    after_script:
+    - docker stop COQ
+
+  - if: branch = coq-master
+    dist: bionic
+    language: minimal
+    services:
+    - docker
+    env:
+    - COQ=dev ELPI="pin add coq-elpi ${ELPI_DEV}" CMD="opam pin add coq-hierarchy-builder ."
     install:
     - ./.travis/docker-install.sh
     script:
diff --git a/.travis/docker-install.sh b/.travis/docker-install.sh
index 9797e5d1f..7f405130b 100755
--- a/.travis/docker-install.sh
+++ b/.travis/docker-install.sh
@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 
-docker pull ${COQ}
-docker run -d -i --init --name=COQ -v ${TRAVIS_BUILD_DIR}:/home/coq/${CONTRIB_NAME} -w /home/coq/${CONTRIB_NAME} ${COQ}
+docker pull coqorg/coq:${COQ}
+docker run -d -i --init --name=COQ -v ${TRAVIS_BUILD_DIR}:/home/coq/${CONTRIB_NAME} -w /home/coq/${CONTRIB_NAME} coqorg/coq:${COQ}
 docker exec COQ /bin/bash --login -c "
   export PS4='+ \e[33;1m(\$0 @ line \$LINENO) \$\e[0m '; set -ex
-  opam update -y
-  opam install -y -v -j ${NJOBS} ${ELPI}
-  opam config list; opam repo list; opam list
+  export OPAMYES=true
+  export OPAMJOBS=2
+  export OPAMVERBOSE=true
+  opam update
+  opam config list; opam repo list
+  opam ${ELPI}
+  opam list
   " install
diff --git a/.travis/docker-test.sh b/.travis/docker-test.sh
index b7c316135..5d173ba2d 100755
--- a/.travis/docker-test.sh
+++ b/.travis/docker-test.sh
@@ -4,6 +4,9 @@ echo -e "${ANSI_YELLOW}Building ${CONTRIB_NAME}...${ANSI_RESET}" && echo -en 'tr
 
 docker exec COQ /bin/bash --login -c "
   export PS4='+ \e[33;1m(\$0 @ line \$LINENO) \$\e[0m '; set -ex
+  export OPAMYES=true
+  export OPAMJOBS=2
+  export OPAMVERBOSE=true
   sudo chown -R coq:coq /home/coq/${CONTRIB_NAME}
   ( ${CMD} )
   " script