From f903398f43fe676f9a3d0ef930d63816ed6892f9 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 29 Mar 2021 15:14:24 +0100 Subject: [PATCH] Add OCaml 4.13, switch to OCaml 4.12 by default + add Alpine 3.13 and switch Fedora from 32 to 33 --- ocaml-dockerfile | 2 +- ocaml-version | 2 +- service/pipeline.ml | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ocaml-dockerfile b/ocaml-dockerfile index c072bc80..f1845542 160000 --- a/ocaml-dockerfile +++ b/ocaml-dockerfile @@ -1 +1 @@ -Subproject commit c072bc8000b55744066dabd48e8cd903a44a5e01 +Subproject commit f184554282a3836bf3f1c34d20e77d0530f8349d diff --git a/ocaml-version b/ocaml-version index 30e8320a..290f20c5 160000 --- a/ocaml-version +++ b/ocaml-version @@ -1 +1 @@ -Subproject commit 30e8320a77dd0d14bdea08eab7d7eecb7e38812c +Subproject commit 290f20c5648f3acbe7602d5ede9371527bb27fd4 diff --git a/service/pipeline.ml b/service/pipeline.ml index dfd68f03..cda3f87e 100644 --- a/service/pipeline.ml +++ b/service/pipeline.ml @@ -168,7 +168,7 @@ let build_with_cluster ~ocluster ~analysis ~lint ~master source = and+ compilers = Current.list_seq begin let master_distro = Dockerfile_distro.tag_of_distro master_distro in - (Ocaml_version.Releases.recent @ Ocaml_version.Releases.unreleased_betas) |> + (Ocaml_version.Releases.recent @ Ocaml_version.Releases.dev) |> List.map (fun v -> let v = Ocaml_version.with_just_major_and_minor v in let revdeps = Ocaml_version.equal v default_compiler in (* TODO: Remove this when the cluster is ready *) @@ -180,9 +180,10 @@ let build_with_cluster ~ocluster ~analysis ~lint ~master source = and+ distributions = Current.list_seq begin let default_compiler = Ocaml_version.to_string default_compiler in - (Dockerfile_distro.active_tier1_distros `X86_64 @ Dockerfile_distro.active_tier2_distros `X86_64) |> + Dockerfile_distro.active_distros `X86_64 |> List.fold_left (fun acc distro -> - if Dockerfile_distro.compare distro master_distro = 0 then (* TODO: Add Dockerfile_distro.equal *) + if Dockerfile_distro.compare distro master_distro = 0 (* TODO: Add Dockerfile_distro.equal *) + || Dockerfile_distro.os_family_of_distro distro <> `Linux then (* TODO: Unlock this when Windows is ready *) acc else let distro = Dockerfile_distro.tag_of_distro distro in @@ -194,7 +195,7 @@ let build_with_cluster ~ocluster ~analysis ~lint ~master source = let master_distro = Dockerfile_distro.tag_of_distro master_distro in let default_compiler = Ocaml_version.to_string default_compiler in let flambda = Variant.v ~arch:`X86_64 ~distro:master_distro ~compiler:(default_compiler, Some "flambda") in - let nnpchecker = Variant.v ~arch:`X86_64 ~distro:master_distro ~compiler:("4.12", Some "nnpchecker") in (* TODO: use default_compiler instead when >= 4.12 *) + let nnpchecker = Variant.v ~arch:`X86_64 ~distro:master_distro ~compiler:(default_compiler, Some "nnpchecker") in Current.list_seq ( build ~upgrade_opam:true ~revdeps:false "flambda" flambda :: build ~upgrade_opam:true ~revdeps:false "nnpchecker" nnpchecker ::