Merge pull request #1409 from palainp/fix-opam-monorepo-and-Ocaml5-sc…

…ripts fix opam-monorepo issue with Ocaml5+
mirage · Mar 19, 2023 · eb329ce · eb329ce
2 parents e34ae65 + 304db61
commit eb329ce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/lib/mirage/mirage.ml b/lib/mirage/mirage.ml
@@ -376,7 +376,6 @@ let run t = %s.Main.run t ; exit 0|ocaml}
       let min = "4.3.1" and max = "4.4.0" in
       let common =
         [
-          package ~scope:`Switch ~build:true ~min:"4.08.0" "ocaml";
           package ~scope:`Monorepo "lwt";
           package ~scope:`Monorepo ~min ~max "mirage-runtime";
           package ~scope:`Switch ~build:true ~min ~max "mirage";

diff --git a/test/mirage/query/run-hvt.t b/test/mirage/query/run-hvt.t
@@ -28,7 +28,6 @@ Query opam file
     "mirage-logs" { ?monorepo & >= "1.2.0" & < "2.0.0" }
     "mirage-runtime" { ?monorepo & >= "4.3.1" & < "4.4.0" }
     "mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
-    "ocaml" { build & >= "4.08.0" }
     "ocaml-solo5" { build & >= "0.8.1" & < "0.9.0" }
     "opam-monorepo" { build & >= "0.3.2" }
     "solo5" { build & >= "0.7.5" & < "0.8.0" }
@@ -46,7 +45,7 @@ Query opam file
   ["mirage-overlays" "https://github.com/dune-universe/mirage-opam-overlays.git"]]
 
   x-opam-monorepo-opam-provided: ["mirage"
-  "ocaml""ocaml-solo5""opam-monorepo"
+  "ocaml-solo5""opam-monorepo"
   "solo5"]
 
 
@@ -60,7 +59,6 @@ Query packages
   "mirage-logs" { ?monorepo & >= "1.2.0" & < "2.0.0" }
   "mirage-runtime" { ?monorepo & >= "4.3.1" & < "4.4.0" }
   "mirage-solo5" { ?monorepo & >= "0.9.0" & < "0.10.0" }
-  "ocaml" { build & >= "4.08.0" }
   "ocaml-solo5" { build & >= "0.8.1" & < "0.9.0" }
   "opam-monorepo" { build & >= "0.3.2" }
   "solo5" { build & >= "0.7.5" & < "0.8.0" }

diff --git a/test/mirage/query/run.t b/test/mirage/query/run.t
@@ -32,7 +32,6 @@ Query opam file
     "mirage-logs" { ?monorepo & >= "1.2.0" & < "2.0.0" }
     "mirage-runtime" { ?monorepo & >= "4.3.1" & < "4.4.0" }
     "mirage-unix" { ?monorepo & >= "5.0.0" & < "6.0.0" }
-    "ocaml" { build & >= "4.08.0" }
     "opam-monorepo" { build & >= "0.3.2" }
   ]
 
@@ -48,7 +47,6 @@ Query opam file
   ["mirage-overlays" "https://github.com/dune-universe/mirage-opam-overlays.git"]]
 
   x-opam-monorepo-opam-provided: ["mirage"
-  "ocaml"
   "opam-monorepo"]
 
 
@@ -62,7 +60,6 @@ Query packages
   "mirage-logs" { ?monorepo & >= "1.2.0" & < "2.0.0" }
   "mirage-runtime" { ?monorepo & >= "4.3.1" & < "4.4.0" }
   "mirage-unix" { ?monorepo & >= "5.0.0" & < "6.0.0" }
-  "ocaml" { build & >= "4.08.0" }
   "opam-monorepo" { build & >= "0.3.2" }
 
 Query files