From 2ec7bb049c1ad82f0754a7148837dcc8cef23cd0 Mon Sep 17 00:00:00 2001
From: Julien Girard <julien.girard2@cea.fr>
Date: Thu, 31 Mar 2022 14:40:23 +0200
Subject: [PATCH] Fixed dependencies for CI.

---
 .gitlab-ci.yml |  1 -
 caisar.opam    | 11 ++++++-----
 dune-project   | 14 +++++++-------
 nnet.opam      |  9 +++++----
 onnx.opam      |  9 +++++----
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5dbfc4..254f7fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ tests:
   - opam repository add remote https://opam.ocaml.org
   - opam depext --yes ocplib-endian base fmt alt-ergo.2.4.0
   - opam install . --deps-only --with-test --yes
-  - opam install alt-ergo.2.4.0 --yes
   - make
   - make test
   tags:
diff --git a/caisar.opam b/caisar.opam
index a472d8d..333b2f1 100644
--- a/caisar.opam
+++ b/caisar.opam
@@ -4,15 +4,15 @@ version: "0.1"
 synopsis: "Framework for neural network verification"
 depends: [
   "ocaml" {>= "4.13.0"}
-  "dune-site" {>= "2.9.0"}
+  "dune-site" {= "2.9.0"}
   "piqi" {>= "0.7.6"}
   "piqilib" {>= "0.6.14"}
   "zarith" {>= "1.7"}
   "ocplib-endian" {>= "1.0"}
-  "dune" {>= "2.9" & >= "2.7.1"}
+  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
   "base" {>= "v0.14.0"}
   "stdio" {>= "v0.14.0"}
-  "cmdliner" {>= "1.0.4"}
+  "cmdliner" {= "1.0.4"}
   "fmt" {>= "0.8.9"}
   "logs" {>= "0.7.0"}
   "ppx_deriving" {>= "5.1"}
@@ -26,7 +26,7 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
@@ -34,7 +34,8 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
diff --git a/dune-project b/dune-project
index e059691..c7418cd 100644
--- a/dune-project
+++ b/dune-project
@@ -14,15 +14,15 @@
   (synopsis "Framework for neural network verification")
   (depends
    (ocaml (>= 4.13.0))
-   (dune-site (>= 2.9.0))
+   (dune-site (= 2.9.0))
    (piqi (>= 0.7.6))
    (piqilib (>= 0.6.14))
    (zarith (>= 1.7))
    (ocplib-endian (>= 1.0))
-   (dune (>= 2.7.1))
+   (dune (and (>= 2.7.1) (<= 2.9.0)))
    (base (>= v0.14.0))
    (stdio (>= v0.14.0))
-   (cmdliner (>= 1.0.4))
+   (cmdliner (= 1.0.4))
    (fmt (>= 0.8.9))
    (logs (>= 0.7.0))
    (ppx_deriving (>= 5.1))
@@ -44,8 +44,8 @@
   (name nnet)
   (synopsis "NNet parser")
   (depends
-   (ocaml (>= 4.10))
-   (dune (>= 2.9.1))
+   (ocaml (>= 4.13))
+   (dune (and (>= 2.7.1) (<= 2.9.0)))
    (base (>= v0.14.0))
   )
 )
@@ -54,8 +54,8 @@
   (name onnx)
   (synopsis "ONNX parser")
   (depends
-   (ocaml (>= 4.10))
-   (dune (>= 2.9.1))
+   (ocaml (>= 4.13))
+   (dune (and (>= 2.7.1) (<= 2.9.0)))
    (base (>= v0.14.0))
    (ocaml-protoc-plugin (= 4.2.0))
   )
diff --git a/nnet.opam b/nnet.opam
index aa2ffd8..cebe3b8 100644
--- a/nnet.opam
+++ b/nnet.opam
@@ -3,13 +3,13 @@ opam-version: "2.0"
 version: "0.1"
 synopsis: "NNet parser"
 depends: [
-  "ocaml" {>= "4.10"}
-  "dune" {>= "2.9" & >= "2.9.1"}
+  "ocaml" {>= "4.13"}
+  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
   "base" {>= "v0.14.0"}
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
@@ -17,7 +17,8 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
diff --git a/onnx.opam b/onnx.opam
index 1440f20..7301915 100644
--- a/onnx.opam
+++ b/onnx.opam
@@ -3,14 +3,14 @@ opam-version: "2.0"
 version: "0.1"
 synopsis: "ONNX parser"
 depends: [
-  "ocaml" {>= "4.10"}
-  "dune" {>= "2.9" & >= "2.9.1"}
+  "ocaml" {>= "4.13"}
+  "dune" {>= "2.9" & >= "2.7.1" & <= "2.9.0"}
   "base" {>= "v0.14.0"}
   "ocaml-protoc-plugin" {= "4.2.0"}
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
@@ -18,7 +18,8 @@ build: [
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
-- 
GitLab