From fb39b066bfd92b2f47a4519f817c860ed6b2a005 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 28 Feb 2020 17:22:16 +0100
Subject: [ci] bump dune to 2.0.1 due to upstream problems

---
 dev/ci/docker/bionic_coq/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index b8f9d99702..9a7cbdc7e8 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2019-12-08-V82"
+# CACHEKEY: "bionic_coq-V2019-03-01-V33"
 # ^^ Update when modifying this file.
 
 FROM ubuntu:bionic
@@ -37,7 +37,7 @@ ENV COMPILER="4.05.0"
 # Common OPAM packages.
 # `num` does not have a version number as the right version to install varies
 # with the compiler version.
-ENV BASE_OPAM="num ocamlfind.1.8.1 dune.2.0.0 ounit.2.0.8 odoc.1.4.2" \
+ENV BASE_OPAM="num ocamlfind.1.8.1 dune.2.0.1 ounit.2.0.8 odoc.1.4.2" \
     CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \
     BASE_ONLY_OPAM="elpi.1.8.0"
 
-- 
cgit v1.2.3


From 804f60e57f8df970604731af20cd3a1c8d97c037 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 28 Feb 2020 10:40:58 +0100
Subject: [ci] [docker] bump elpi to 1.10.2

---
 dev/ci/docker/bionic_coq/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 9a7cbdc7e8..41392b4b8c 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -1,4 +1,4 @@
-# CACHEKEY: "bionic_coq-V2019-03-01-V33"
+# CACHEKEY: "bionic_coq-V2019-03-01-V43"
 # ^^ Update when modifying this file.
 
 FROM ubuntu:bionic
@@ -39,7 +39,7 @@ ENV COMPILER="4.05.0"
 # with the compiler version.
 ENV BASE_OPAM="num ocamlfind.1.8.1 dune.2.0.1 ounit.2.0.8 odoc.1.4.2" \
     CI_OPAM="menhir.20190626 ocamlgraph.1.8.8" \
-    BASE_ONLY_OPAM="elpi.1.8.0"
+    BASE_ONLY_OPAM="elpi.1.10.2"
 
 # BASE switch; CI_OPAM contains Coq's CI dependencies.
 ENV COQIDE_OPAM="cairo2.0.6.1 lablgtk3-sourceview3.3.0.beta6"
-- 
cgit v1.2.3


From f157dcd938c9ec4530d74cbf414fd18c41e56df6 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Fri, 28 Feb 2020 10:42:48 +0100
Subject: [ci] [docker] overlay for elpi 1.10

---
 dev/ci/user-overlays/11051-gares-elpi-1.8.sh  | 6 ------
 dev/ci/user-overlays/11708-gares-elpi-1.10.sh | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 dev/ci/user-overlays/11051-gares-elpi-1.8.sh
 create mode 100644 dev/ci/user-overlays/11708-gares-elpi-1.10.sh

(limited to 'dev')

diff --git a/dev/ci/user-overlays/11051-gares-elpi-1.8.sh b/dev/ci/user-overlays/11051-gares-elpi-1.8.sh
deleted file mode 100644
index 7845654375..0000000000
--- a/dev/ci/user-overlays/11051-gares-elpi-1.8.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ "$CI_PULL_REQUEST" = "11051" ] || [ "$CI_BRANCH" = "elpi-1.8" ]; then
-
-    elpi_CI_REF="coq-master+v1.2"
-    elpi_CI_GITURL=https://github.com/LPCIC/coq-elpi
-
-fi
diff --git a/dev/ci/user-overlays/11708-gares-elpi-1.10.sh b/dev/ci/user-overlays/11708-gares-elpi-1.10.sh
new file mode 100644
index 0000000000..121190e5f6
--- /dev/null
+++ b/dev/ci/user-overlays/11708-gares-elpi-1.10.sh
@@ -0,0 +1,6 @@
+if [ "$CI_PULL_REQUEST" = "11708" ] || [ "$CI_BRANCH" = " elpi-1.10+coq-elpi-1.3" ]; then
+
+    elpi_CI_REF="coq-master+coq-elpi-1.3"
+    elpi_CI_GITURL=https://github.com/LPCIC/coq-elpi
+
+fi
-- 
cgit v1.2.3