ci for coq master

.travis.yml

@@ -4,6 +4,13 @@ branches:
   only:
   - master
 
+env:
+  global:
+  - 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:
   - language: nix
@@ -23,13 +30,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"
+    - COQ=8.10 ELPI="install ${ELPI_810}" 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 +43,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"
+    - COQ=8.11 ELPI="install ${ELPI_811}" 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 +56,24 @@ 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"
+    - 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
+    - ./.travis/docker-install.sh
     script:
-    - ./.travis.docker-test.sh
+    - ./.travis/docker-test.sh
     after_script:
     - docker stop COQ

.travis/docker-install.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+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
+  export OPAMYES=true
+  export OPAMJOBS=2
+  export OPAMVERBOSE=true
+  opam update
+  opam config list; opam repo list
+  opam ${ELPI}
+  opam list
+  " install

.travis.docker-test.sh → .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