Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OCaml 4.13, switch to OCaml 4.12 by default + add Alpine 3.13 and switch Fedora from 32 to 33 #86

Merged
merged 1 commit into from
Mar 29, 2021
Merged

Add OCaml 4.13, switch to OCaml 4.12 by default + add Alpine 3.13 and switch Fedora from 32 to 33 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocaml-dockerfile
Open in desktop
Submodule ocaml-dockerfile updated from c072bc to f18455
2 changes: 1 addition & 1 deletion ocaml-version
Open in desktop
Submodule ocaml-version updated 3 files
+12 −2 CHANGES.md
+146 −32 ocaml_version.ml
+34 −6 ocaml_version.mli
9 changes: 5 additions & 4 deletions service/pipeline.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *)
Expand All @@ -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
Expand All @@ -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 ::
Expand Down