Merge pull request #96 from avsm/multicore-base

Multicore base images for 4.10
ocurrent · Mar 6, 2021 · 94592ca · 94592ca
2 parents dbe9e9b + 6812c1f
commit 94592ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/ocaml-dockerfile b/ocaml-dockerfile
diff --git a/ocaml-version b/ocaml-version
diff --git a/src/conf.ml b/src/conf.ml
@@ -43,7 +43,7 @@ let switches ~arch ~distro =
   )
 
 (* We can't get the active distros directly, but assume x86_64 is a superset of everything else. *)
-let distros = Dockerfile_distro.active_distros `X86_64
+let distros = Dockerfile_distro.(active_distros `X86_64 |> List.filter (fun d -> os_family_of_distro d = `Linux))
 
 let arches_for ~distro = Dockerfile_distro.distro_arches Ocaml_version.Releases.latest distro
 

diff --git a/src/pipeline.ml b/src/pipeline.ml
@@ -23,6 +23,14 @@ let maybe_add_beta switch =
   else
     empty
 
+let maybe_add_multicore switch =
+  let open Dockerfile in
+  let c = Ocaml_version.Configure_options.of_t switch |> Result.get_ok in
+  if List.mem `Multicore c then
+    run "opam repo add multicore git://github.com/ocaml-multicore/multicore-opam --set-default"
+  else
+    empty
+
 let maybe_install_secondary_compiler ~switch =
   let dune_min_native_support = Ocaml_version.Releases.v4_08 in
   let open Dockerfile in
@@ -49,6 +57,7 @@ let install_compiler_df ~arch ~switch opam_image =
   from opam_image @@
   personality @@
   maybe_add_beta switch @@
+  maybe_add_multicore switch @@
   env ["OPAMYES", "1";
        "OPAMDEPEXTYES", "1"; (* Remove this when https://github.com/ocaml/opam/pull/4563 is merged *)
        "OPAMUNSAFEDEPEXTYES", "1";
+2 −0		CHANGES.md
+37 −2		ocaml_version.ml
+8 −1		ocaml_version.mli