fix CI wrt release of coq-elpi

Author: gares

.travis.yml

@@ -7,73 +7,54 @@ branches:
 env:
   global:
   - CONTRIB_NAME=hb
-  - ELPI_810=coq-elpi.1.3.0
-  - ELPI_811=coq-elpi.1.3.1
+  - ELPI_811=coq-elpi.1.4.0
   - ELPI_DEV=https://github.com/LPCIC/coq-elpi.git#coq-master
 
 jobs:
   include:
-  # - language: nix
-  #   env:
-  #   - COQ=8.10
-  #   script:
-  #   - nix-build --argstr coq-version "${COQ}"
 
   - language: nix
     env:
     - COQ=8.11
     script:
     - nix-build --argstr coq-version "${COQ}"
 
-  # - dist: bionic
-  #   language: minimal
-  #   services:
-  #   - docker
-  #   env:
-  #   - COQ=8.10 ELPI="install ${ELPI_810}" CMD="make && make install"
-  #   install:
-  #   - ./.travis/docker-install.sh
-  #   script:
-  #   - ./.travis/docker-test.sh
-  #   after_script:
-  #   - docker stop COQ
-
-  # - dist: bionic
-  #   language: minimal
-  #   services:
-  #   - docker
-  #   env:
-  #   - COQ=8.11 ELPI="install ${ELPI_811}" CMD="make && make install"
-  #   install:
-  #   - ./.travis/docker-install.sh
-  #   script:
-  #   - ./.travis/docker-test.sh
-  #   after_script:
-  #   - docker stop COQ
-
-  # - dist: bionic
-  #   language: minimal
-  #   services:
-  #   - docker
-  #   env:
-  #   - 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:
-  #   - ./.travis/docker-test.sh
-  #   after_script:
-  #   - docker stop COQ
+  - dist: bionic
+    language: minimal
+    services:
+    - docker
+    env:
+    - COQ=8.11 ELPI="install ${ELPI_811}" CMD="make && make install"
+    install:
+    - ./.travis/docker-install.sh
+    script:
+    - ./.travis/docker-test.sh
+    after_script:
+    - docker stop COQ
+
+  - dist: bionic
+    language: minimal
+    services:
+    - docker
+    env:
+    - 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:
+    - ./.travis/docker-test.sh
+    after_script:
+    - docker stop COQ

default.nix

@@ -16,8 +16,8 @@ let
     }."${coq-version}";
   coq = myCoqPackages.coq;
   coq-elpi = myCoqPackages.coq-elpi.overrideAttrs(o: {
-    name = "coq8.11-elpi-784659c";
-    src = fetchTarball https://github.com/LPCIC/coq-elpi/archive/784659cbc4ced031b87fc9eda349162169f15084.tar.gz;
+    name = "coq8.11-elpi-v1.4.0";
+    src = fetchTarball https://github.com/LPCIC/coq-elpi/archive/v1.4.0.tar.gz;
   });
 in
 stdenv.mkDerivation {