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

update to ocaml 4.14.2 and 5.2 #49

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update to ocaml 4.14.2 and 5.2 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c36045
update to ocaml 4.14.2 and 5.2
hannesm Dec 11, 2024
b66f2e3
autoformat, use 0.26.2
hannesm Dec 11, 2024
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 .ocamlformat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 0.25.1
version = 0.26.2
profile = conventional
break-infix = fit-or-vertical
parse-docstrings = true
Expand Down
36 changes: 15 additions & 21 deletions src/lib/common/platform.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
type ocaml_version = V4_10 | V4_11 | V4_12 | V4_13
type ocaml_version = V4_14 | V5_2

let pp_ocaml f = function
| V4_10 -> Fmt.pf f "4.10"
| V4_11 -> Fmt.pf f "4.11"
| V4_12 -> Fmt.pf f "4.12"
| V4_13 -> Fmt.pf f "4.13"
let pp_ocaml f = function V4_14 -> Fmt.pf f "4.14" | V5_2 -> Fmt.pf f "5.2"

let pp_exact_ocaml f = function
| V4_10 -> Fmt.pf f "4.10.2"
| V4_11 -> Fmt.pf f "4.11.2"
| V4_12 -> Fmt.pf f "4.12.1"
| V4_13 -> Fmt.pf f "4.13.1"
| V4_14 -> Fmt.pf f "4.14.2"
| V5_2 -> Fmt.pf f "5.2.1"

type os = Debian | Ubuntu | Fedora

Expand Down Expand Up @@ -48,24 +42,24 @@ let ocluster_pool { arch; _ } =

(* Base configuration.. *)

let platform_v412_amd64 =
{ system = { ocaml = V4_12; os = Debian }; arch = Amd64 }
let platform_v414_amd64 =
{ system = { ocaml = V4_14; os = Debian }; arch = Amd64 }

let platform_v412_arm64 =
{ system = { ocaml = V4_12; os = Debian }; arch = Arm64 }
let platform_v414_arm64 =
{ system = { ocaml = V4_14; os = Debian }; arch = Arm64 }

let platform_v413_amd64 =
{ system = { ocaml = V4_13; os = Debian }; arch = Amd64 }
let platform_v52_amd64 =
{ system = { ocaml = V5_2; os = Debian }; arch = Amd64 }

let platform_v413_arm64 =
{ system = { ocaml = V4_13; os = Debian }; arch = Arm64 }
let platform_v52_arm64 =
{ system = { ocaml = V5_2; os = Debian }; arch = Arm64 }

let platform_host =
Bos.Cmd.(v "uname" % "-m")
|> Bos.OS.Cmd.run_out
|> Bos.OS.Cmd.out_string
|> Result.to_option
|> Option.map (function
| ("aarch64" | "arm64"), _ -> platform_v413_arm64
| _ -> platform_v413_amd64)
|> Option.value ~default:platform_v413_amd64
| ("aarch64" | "arm64"), _ -> platform_v414_arm64
| _ -> platform_v414_amd64)
|> Option.value ~default:platform_v414_amd64
8 changes: 7 additions & 1 deletion src/pipelines/PR.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,13 @@ module Run = struct
in

let pipeline =
Platform.[ platform_v413_amd64; platform_v413_arm64 ]
Platform.
[
platform_v414_amd64;
platform_v414_arm64;
platform_v52_amd64;
platform_v52_arm64;
]
|> List.map (fun platform ->
perform_test ~metadata ~platform commit)
|> Current_web_pipelines.Task.all
Expand Down