robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Views++: Factored Job.Build to Job_build + Renamed Builder to Builds to avoid collision with lib

Browse source
This commit is contained in:
rand00 2022-02-02 23:03:16 +01:00
parent f40a081198
commit c17802d84f
2 changed files with 206 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/builder_web.ml
View file

@ -100,7 +100,7 @@ let dream_svg ?status ?code ?headers body =
let add_routes datadir = let add_routes datadir =
let datadir_global = Dream.new_global ~name:"datadir" (fun () -> datadir) in let datadir_global = Dream.new_global ~name:"datadir" (fun () -> datadir) in
let builder req = let builds req =
Dream.sql req Model.jobs_with_section_synopsis Dream.sql req Model.jobs_with_section_synopsis
|> if_error "Error getting jobs" |> if_error "Error getting jobs"
~log:(fun e -> Log.warn (fun m -> m "Error getting jobs: %a" pp_error e)) ~log:(fun e -> Log.warn (fun m -> m "Error getting jobs: %a" pp_error e))
@ -126,7 +126,7 @@ let add_routes datadir =
|> if_error "Error getting jobs" |> if_error "Error getting jobs"
~log:(fun e -> Log.warn (fun m -> m "Error getting jobs: %a" pp_error e)) ~log:(fun e -> Log.warn (fun m -> m "Error getting jobs: %a" pp_error e))
>>= fun jobs -> >>= fun jobs ->
Views.builder jobs |> string_of_html |> Dream.html |> Lwt_result.ok Views.Builds.make jobs |> string_of_html |> Dream.html |> Lwt_result.ok
in in
let job req = let job req =
@ -279,7 +279,7 @@ let add_routes datadir =
|> if_error "Error getting job build" |> if_error "Error getting job build"
~log:(fun e -> Log.warn (fun m -> m "Error getting job build: %a" pp_error e)) ~log:(fun e -> Log.warn (fun m -> m "Error getting job build: %a" pp_error e))
>>= fun (build, artifacts, same_input_same_output, different_input_same_output, same_input_different_output, latest, next, previous) -> >>= fun (build, artifacts, same_input_same_output, different_input_same_output, same_input_different_output, latest, next, previous) ->
Views.Job.Build.make Views.Job_build.make
~name:job_name ~name:job_name
~build ~build
~artifacts ~artifacts
@ -493,7 +493,7 @@ let add_routes datadir =
let w f req = or_error_response (f req) in let w f req = or_error_response (f req) in
Dream.router [ Dream.router [
Dream.get "/" (w builder); Dream.get "/" (w builds);
Dream.get "/job/:job/" (w job); Dream.get "/job/:job/" (w job);
Dream.get "/job/:job/failed/" (w job_with_failed); Dream.get "/job/:job/failed/" (w job_with_failed);
Dream.get "/job/:job/build/latest/**" (w redirect_latest); Dream.get "/job/:job/build/latest/**" (w redirect_latest);

477
lib/views.ml
View file

@ -155,152 +155,79 @@ let artifact ?(basename=false) job_name build { Builder_db.filepath; localpath =
txtf " (%a)" Fmt.byte_size size; txtf " (%a)" Fmt.byte_size size;
] ]
module Builds = struct
let make section_job_map =
let builder section_job_map = layout ~title:"Reproducible OPAM builds"
layout ~title:"Reproducible OPAM builds" ([ h1 [txt "Reproducible OPAM builds"];
([ h1 [txt "Reproducible OPAM builds"]; p [ txt "This website offers binary MirageOS unikernels and supplementary OS packages." ];
p [ txt "This website offers binary MirageOS unikernels and supplementary OS packages." ]; p [ txt {|Following is a list of jobs that are built daily. A persistent link to the latest successful build is available as /job/*jobname*/build/latest/. All builds can be reproduced with |} ;
p [ txt {|Following is a list of jobs that are built daily. A persistent link to the latest successful build is available as /job/*jobname*/build/latest/. All builds can be reproduced with |} ; a ~a:[a_href "https://github.com/roburio/orb/"] [txt "orb"];
a ~a:[a_href "https://github.com/roburio/orb/"] [txt "orb"]; txt ". The builds are scheduled and executed by ";
txt ". The builds are scheduled and executed by "; a ~a:[a_href "https://github.com/roburio/builder/"] [txt "builder"];
a ~a:[a_href "https://github.com/roburio/builder/"] [txt "builder"]; txt ". The web interface is ";
txt ". The web interface is "; a ~a:[a_href "https://git.robur.io/robur/builder-web/"] [txt "builder-web"];
a ~a:[a_href "https://git.robur.io/robur/builder-web/"] [txt "builder-web"]; txt ". Contact team@robur.coop if you have any questions or suggestions.";
txt ". Contact team@robur.coop if you have any questions or suggestions."; ];
]; form ~a:[a_action "/hash"; a_method `Get]
form ~a:[a_action "/hash"; a_method `Get] [
[ label [
label [ txt "Search artifact by SHA256";
txt "Search artifact by SHA256"; br ();
br (); input ~a:[
input ~a:[ a_input_type `Search;
a_input_type `Search; a_id "sha256";
a_id "sha256"; a_name "sha256";
a_name "sha256"; ] ();
] (); ];
]; input ~a:[
input ~a:[ a_input_type `Submit;
a_input_type `Submit; a_value "Search";
a_value "Search"; ] ();
] (); ];
]; ] @
] @
Utils.String_map.fold (fun section jobs acc -> Utils.String_map.fold (fun section jobs acc ->
acc @ [ acc @ [
h2 [ txt section ]; h2 [ txt section ];
ul (List.map (fun (job_name, synopsis, platform_builds) -> ul (List.map (fun (job_name, synopsis, platform_builds) ->
li ([ li ([
a ~a:[a_href ("job/" ^ job_name ^ "/")] [txt job_name]; a ~a:[a_href ("job/" ^ job_name ^ "/")] [txt job_name];
br (); br ();
txt (Option.value ~default:"" synopsis); txt (Option.value ~default:"" synopsis);
br () br ()
] @ ] @
List.flatten List.flatten
(List.map (fun (platform, latest_build, latest_artifact) -> (List.map (fun (platform, latest_build, latest_artifact) ->
[ [
check_icon latest_build.Builder_db.Build.result; check_icon latest_build.Builder_db.Build.result;
txt " "; txt " ";
a ~a:[Fmt.kstr a_href "job/%s/%a" job_name pp_platform_query (Some platform)][txt platform]; a ~a:[Fmt.kstr a_href "job/%s/%a" job_name pp_platform_query (Some platform)][txt platform];
txt " "; txt " ";
a ~a:[Fmt.kstr a_href "job/%s/build/%a/" job_name Uuidm.pp a ~a:[Fmt.kstr a_href "job/%s/build/%a/" job_name Uuidm.pp
latest_build.Builder_db.Build.uuid] latest_build.Builder_db.Build.uuid]
[txtf "%a" pp_ptime latest_build.Builder_db.Build.start]; [txtf "%a" pp_ptime latest_build.Builder_db.Build.start];
txt " "; txt " ";
] @ (match latest_artifact with ] @ (match latest_artifact with
| Some main_binary -> | Some main_binary ->
artifact ~basename:true job_name latest_build main_binary artifact ~basename:true job_name latest_build main_binary
| None -> | None ->
[ txtf "Build failure: %a" Builder.pp_execution_result [ txtf "Build failure: %a" Builder.pp_execution_result
latest_build.Builder_db.Build.result ] latest_build.Builder_db.Build.result ]
) @ [ br () ]) ) @ [ br () ])
platform_builds) platform_builds)
)) ))
jobs) jobs)
]) ])
section_job_map section_job_map
[] @ [] @
[ p [ [ p [
txt "View the latest failed builds "; txt "View the latest failed builds ";
a ~a:[a_href "/failed-builds/"] a ~a:[a_href "/failed-builds/"]
[txt "here"]; [txt "here"];
txt "." txt "."
]]) ]])
let safe_omd omd = end
let rec safe_block = function
| Omd.Paragraph (attr, inline) ->
safe_inline inline
|> Option.map (fun inline -> Omd.Paragraph (attr, inline))
| Omd.List (attr, typ, spacing, blocks) ->
let blocks = List.filter_map (fun b ->
let b = List.filter_map safe_block b in
if b = [] then None else Some b)
blocks
in
if blocks = [] then None else
Some (Omd.List (attr, typ, spacing, blocks))
| Omd.Blockquote (attr, blocks) ->
let blocks = List.filter_map safe_block blocks in
if blocks = [] then None else
Some (Omd.Blockquote (attr, blocks))
| Omd.Heading (attr, level, inline) ->
safe_inline inline
|> Option.map (fun inline -> Omd.Heading (attr, level, inline))
| Omd.Html_block _ -> None
| Omd.Definition_list (attr, def_elts) ->
let def_elts = List.filter_map safe_def_elts def_elts in
if def_elts = [] then None else
Some (Omd.Definition_list (attr, def_elts))
| Omd.Code_block _
| Omd.Thematic_break _ as v -> Some v
and safe_def_elts { term ; defs } =
let defs = List.filter_map safe_inline defs in
safe_inline term
|> Option.map (fun term -> { Omd.term ; defs })
and safe_inline = function
| Concat (attr, inline) ->
Some (Concat (attr, List.filter_map safe_inline inline))
| Emph (attr, inline) ->
safe_inline inline
|> Option.map (fun inline -> Omd.Emph (attr, inline))
| Strong (attr, inline) ->
safe_inline inline
|> Option.map (fun inline -> Omd.Strong (attr, inline))
| Link (attr, link) ->
begin match safe_link link with
| `No_label | `Relative -> safe_inline link.Omd.label
| `Link l -> Some (Omd.Link (attr, l))
end
| Image (attr, link) ->
begin match safe_link link with
| `No_label | `Relative -> None
| `Link l -> Some (Omd.Image (attr, l))
end
| Html _ -> None
| Text _
| Code _
| Hard_break _
| Soft_break _ as v -> Some v
and safe_link ({ label ; destination ; _ } as l) =
let absolute_link =
String.(length destination >= 2 && equal (sub destination 0 2) "//") ||
String.(length destination >= 7 && equal (sub destination 0 7) "http://") ||
String.(length destination >= 8 && equal (sub destination 0 8) "https://")
in
if absolute_link then
match safe_inline label with
| None -> `No_label
| Some label -> `Link { l with label }
else
`Relative
in
List.filter_map safe_block omd
let markdown_to_html data =
let omd = Omd.of_string data in
let omd = safe_omd omd in
Omd.to_html omd
module Job = struct module Job = struct
@ -313,7 +240,7 @@ module Job = struct
[ [
h2 ~a:[a_id "readme"] [txt "README"]; h2 ~a:[a_id "readme"] [txt "README"];
a ~a:[a_href "#builds"] [txt "Skip to builds"]; a ~a:[a_href "#builds"] [txt "Skip to builds"];
Unsafe.data (markdown_to_html data) Unsafe.data (Utils.Omd.html_of_string data)
])) @ ])) @
[ [
h2 ~a:[a_id "builds"] [txt "Builds"]; h2 ~a:[a_id "builds"] [txt "Builds"];
@ -340,104 +267,106 @@ module Job = struct
p [ txt "Including failed builds " ; a ~a:[a_href "failed/"] [txt "here"] ; txt "." ] p [ txt "Including failed builds " ; a ~a:[a_href "failed/"] [txt "here"] ; txt "." ]
]) ])
end
module Job_build = struct
let contains_debug_bin artifacts = let contains_debug_bin artifacts =
let check f = let check f =
Fpath.has_ext "debug" f.Builder_db.filepath Fpath.has_ext "debug" f.Builder_db.filepath
in in
List.exists check artifacts List.exists check artifacts
module Build = struct let make_build_info
~name
let make_build_info ~delta
~name ~(build:Builder_db.Build.t) (* ({ Builder_db.Build.uuid; start; finish; result; platform; _ } as build) *)
~delta ~artifacts
~(build:Builder_db.Build.t) (* ({ Builder_db.Build.uuid; start; finish; result; platform; _ } as build) *) ~same_input_same_output
~artifacts ~different_input_same_output
~same_input_same_output ~same_input_different_output
~different_input_same_output ~latest ~next ~previous
~same_input_different_output =
~latest ~next ~previous [
= h2 ~a:[a_id "build"] [txtf "Build %a" pp_ptime build.start];
[ p [txtf "Built on platform %s" build.platform ];
h2 ~a:[a_id "build"] [txtf "Build %a" pp_ptime build.start]; p [txtf "Build took %a." Ptime.Span.pp delta ];
p [txtf "Built on platform %s" build.platform ]; p [txtf "Execution result: %a." Builder.pp_execution_result build.result];
p [txtf "Build took %a." Ptime.Span.pp delta ]; h3 [txt "Build info"];
p [txtf "Execution result: %a." Builder.pp_execution_result build.result]; ul [
h3 [txt "Build info"]; li [ a ~a:[Fmt.kstr a_href "/job/%s/build/%a/console" name Uuidm.pp build.uuid]
ul [ [txt "Console output"];
li [ a ~a:[Fmt.kstr a_href "/job/%s/build/%a/console" name Uuidm.pp build.uuid]
[txt "Console output"];
];
li [ a ~a:[Fmt.kstr a_href "/job/%s/build/%a/script" name Uuidm.pp build.uuid]
[txt "Build script"];
]
]; ];
h3 [txt "Build artifacts"]; li [ a ~a:[Fmt.kstr a_href "/job/%s/build/%a/script" name Uuidm.pp build.uuid]
dl (List.concat_map [txt "Build script"];
(fun { Builder_db.filepath; localpath=_; sha256; size } -> ]
let (`Hex sha256_hex) = Hex.of_cstruct sha256 in ];
[ h3 [txt "Build artifacts"];
dt [a dl (List.concat_map
~a:[Fmt.kstr a_href "f/%a" Fpath.pp filepath] (fun { Builder_db.filepath; localpath=_; sha256; size } ->
[code [txtf "%a" Fpath.pp filepath]]]; let (`Hex sha256_hex) = Hex.of_cstruct sha256 in
dd [ [
code [txt "SHA256:"; txt sha256_hex]; dt [a
txtf " (%a)" Fmt.byte_size size; ~a:[Fmt.kstr a_href "f/%a" Fpath.pp filepath]
]; [code [txtf "%a" Fpath.pp filepath]]];
]) dd [
artifacts); code [txt "SHA256:"; txt sha256_hex];
h3 [ txtf "Reproduced by %d builds" (List.length (same_input_same_output @ different_input_same_output))] ; txtf " (%a)" Fmt.byte_size size;
ul ];
((List.map (fun { Builder_db.Build.start ; uuid ; platform ; _ } -> ])
artifacts);
h3 [ txtf "Reproduced by %d builds" (List.length (same_input_same_output @ different_input_same_output))] ;
ul
((List.map (fun { Builder_db.Build.start ; uuid ; platform ; _ } ->
li [
txtf "on %s, same input, " platform;
a ~a:[Fmt.kstr a_href "/job/%s/build/%a/" name Uuidm.pp uuid]
[txtf "%a" pp_ptime start]
])
same_input_same_output) @
List.map (fun { Builder_db.Build.start ; uuid = other_uuid ; platform ; _ } ->
li [
txtf "on %s, different input, " platform;
a ~a:[Fmt.kstr a_href "/compare/%a/%a/"
Uuidm.pp other_uuid Uuidm.pp build.uuid]
[txtf "%a" pp_ptime start]
])
different_input_same_output)
]
@ (if same_input_different_output = [] then
[]
else
[ h3 [txt "Same input, different output (not reproducible!)"];
ul (
List.map (fun { Builder_db.Build.start ; uuid = other_uuid ; platform ; _ } ->
li [ li [
txtf "on %s, same input, " platform; txtf "on %s, " platform ;
a ~a:[Fmt.kstr a_href "/job/%s/build/%a/" name Uuidm.pp uuid] a ~a:[Fmt.kstr a_href "/compare/%a/%a/" Uuidm.pp other_uuid Uuidm.pp build.uuid]
[txtf "%a" pp_ptime start] [txtf "%a" pp_ptime start]
]) ])
same_input_same_output) @ same_input_different_output)
List.map (fun { Builder_db.Build.start ; uuid = other_uuid ; platform ; _ } -> ]
li [ )
txtf "on %s, different input, " platform; @ [
a ~a:[Fmt.kstr a_href "/compare/%a/%a/" h3 [txt "Comparisons with other builds on the same platform"];
Uuidm.pp other_uuid Uuidm.pp build.uuid] let opt_build (ctx, build') =
[txtf "%a" pp_ptime start] match build' with
]) | Some b when not (Uuidm.equal build.uuid b.Builder_db.Build.uuid) ->
different_input_same_output) [ li [ txt ctx;
] a ~a:[Fmt.kstr a_href "/compare/%a/%a/"
@ (if same_input_different_output = [] then Uuidm.pp b.uuid Uuidm.pp build.uuid]
[] [txtf "%a" pp_ptime b.start]]
else
[ h3 [txt "Same input, different output (not reproducible!)"];
ul (
List.map (fun { Builder_db.Build.start ; uuid = other_uuid ; platform ; _ } ->
li [
txtf "on %s, " platform ;
a ~a:[Fmt.kstr a_href "/compare/%a/%a/" Uuidm.pp other_uuid Uuidm.pp build.uuid]
[txtf "%a" pp_ptime start]
])
same_input_different_output)
] ]
) | _ -> []
@ [ in
h3 [txt "Comparisons with other builds on the same platform"]; ul
let opt_build (ctx, build') = (List.concat_map opt_build
match build' with [ ("Latest build ", latest) ;
| Some b when not (Uuidm.equal build.uuid b.Builder_db.Build.uuid) -> ("Later build with different output ", next) ;
[ li [ txt ctx; ("Earlier build with different output ", previous) ])
a ~a:[Fmt.kstr a_href "/compare/%a/%a/" ]
Uuidm.pp b.uuid Uuidm.pp build.uuid]
[txtf "%a" pp_ptime b.start]]
]
| _ -> []
in
ul
(List.concat_map opt_build
[ ("Latest build ", latest) ;
("Later build with different output ", next) ;
("Earlier build with different output ", previous) ])
]
let viz_style_deps = " let viz_style_deps = "
width: 46em; width: 46em;
height: 45.4em; height: 45.4em;
max-width: 100%; max-width: 100%;
@ -446,7 +375,7 @@ module Job = struct
min-height: 39em; min-height: 39em;
" "
let viz_style_treemap = " let viz_style_treemap = "
width: 46em; width: 46em;
height: 48.4em; height: 48.4em;
max-width: 100%; max-width: 100%;
@ -455,80 +384,78 @@ module Job = struct
min-height: 41em; min-height: 41em;
" "
let make_viz_section ~name ~artifacts ~uuid = let make_viz_section ~name ~artifacts ~uuid =
[ [
(* [ h3 [txt "Analysis"] ]; *) (* [ h3 [txt "Analysis"] ]; *)
[ p [ [ p [
let src = Fmt.str "/job/%s/build/%a/vizdependencies" name Uuidm.pp uuid in let src = Fmt.str "/job/%s/build/%a/vizdependencies" name Uuidm.pp uuid in
iframe ~a:[ iframe ~a:[
a_src src; a_src src;
a_title "Opam dependencies"; a_title "Opam dependencies";
a_style viz_style_deps a_style viz_style_deps
] [] ] []
]]; ]];
if not @@ contains_debug_bin artifacts then [] else [ if not @@ contains_debug_bin artifacts then [] else [
p [ p [
let src = Fmt.str "/job/%s/build/%a/viztreemap" name Uuidm.pp uuid in let src = Fmt.str "/job/%s/build/%a/viztreemap" name Uuidm.pp uuid in
iframe ~a:[ iframe ~a:[
a_src src; a_src src;
a_title "Binary dissection"; a_title "Binary dissection";
a_style viz_style_treemap a_style viz_style_treemap
] [] ] []
]]; ]];
] |> List.flatten ] |> List.flatten
let make let make
~name
~(build:Builder_db.Build.t)
~artifacts
~same_input_same_output
~different_input_same_output
~same_input_different_output
~latest ~next ~previous
=
let delta = Ptime.diff build.finish build.start in
let right_column = make_viz_section ~name ~artifacts ~uuid:build.uuid in
let left_column =
make_build_info
~name ~name
~(build:Builder_db.Build.t) ~delta
~build
~artifacts ~artifacts
~same_input_same_output ~same_input_same_output
~different_input_same_output ~different_input_same_output
~same_input_different_output ~same_input_different_output
~latest ~next ~previous ~latest ~next ~previous
= in
let delta = Ptime.diff build.finish build.start in let style_grid = a_style "display: flex; " in
let right_column = make_viz_section ~name ~artifacts ~uuid:build.uuid in let style_grid_container = a_style "\
let left_column =
make_build_info
~name
~delta
~build
~artifacts
~same_input_same_output
~different_input_same_output
~same_input_different_output
~latest ~next ~previous
in
let style_grid = a_style "display: flex; " in
let style_grid_container = a_style "\
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
min-width: 83em; min-width: 83em;
" "
in in
let style_col_container = a_style "" in let style_col_container = a_style "" in
let style_col_left = a_style "width: 45em; min-width: 43em; padding-left: 2%" in let style_col_left = a_style "width: 45em; min-width: 43em; padding-left: 2%" in
let style_col_right = a_style "width: 50%" in let style_col_right = a_style "width: 50%" in
let body = [ let body = [
div ~a:[ style_grid_container ] [ div ~a:[ style_grid_container ] [
div ~a:[ style_col_container ] [ div ~a:[ style_col_container ] [
h1 [txtf "Job %s" name]; h1 [txtf "Job %s" name];
div ~a:[ style_grid ] [ div ~a:[ style_grid ] [
(* div ~a:[ style_col_padding ] []; *) (* div ~a:[ style_col_padding ] []; *)
div ~a:[ style_col_left ] left_column; div ~a:[ style_col_left ] left_column;
div ~a:[ style_col_right ] right_column div ~a:[ style_col_right ] right_column
]
] ]
] ]
] ]
in ]
layout in
~nav:(`Build (name, build)) layout
~title:(Fmt.str "Job %s %a" name pp_ptime build.start) ~nav:(`Build (name, build))
body ~title:(Fmt.str "Job %s %a" name pp_ptime build.start)
body
end
end end