diff --git a/db/builder_db.mli b/db/builder_db.mli index 008fc5a..2988c12 100644 --- a/db/builder_db.mli +++ b/db/builder_db.mli @@ -121,7 +121,7 @@ sig val get_all_artifact_sha : ([`job] id * string option, Cstruct.t, [ `Many | `One | `Zero ]) Caqti_request.t val get_latest_successful_with_binary : - ([`job] id * string, [`build] id * t * file option, [ `One | `Zero ]) + ([`job] id * string, [`build] id * t * file, [ `One | `Zero ]) Caqti_request.t val get_failed_builds : ([`job] id * string option, t, [ `Many | `One | `Zero ]) Caqti_request.t diff --git a/lib/model.mli b/lib/model.mli index c81857e..2b36a7c 100644 --- a/lib/model.mli +++ b/lib/model.mli @@ -30,7 +30,7 @@ val build : Uuidm.t -> Caqti_lwt.connection -> ([`build] Builder_db.id * Builder_db.Build.t, [> error ]) result Lwt.t val build_with_main_binary : [`job] Builder_db.id -> string -> Caqti_lwt.connection -> - ((Builder_db.Build.t * Builder_db.file option) option, [> Caqti_error.call_or_retrieve ]) result Lwt.t + ((Builder_db.Build.t * Builder_db.file) option, [> Caqti_error.call_or_retrieve ]) result Lwt.t val build_hash : Cstruct.t -> Caqti_lwt.connection -> ((string * Builder_db.Build.t) option, [> Caqti_error.call_or_retrieve ]) result Lwt.t diff --git a/lib/views.ml b/lib/views.ml index 4de7a2f..9e9e3e3 100644 --- a/lib/views.ml +++ b/lib/views.ml @@ -319,18 +319,13 @@ have questions or suggestions. ~build:latest_build.Builder_db.Build.uuid ()] [txtf "%a" pp_ptime latest_build.Builder_db.Build.start]; H.txt " "; + ] - @ (match latest_artifact with - | Some main_binary -> - artifact - ~basename:true - ~job_name - ~build:latest_build - ~file:main_binary - | None -> - [ txtf "Build failure: %a" Builder.pp_execution_result - latest_build.Builder_db.Build.result ] - ) + @ artifact + ~basename:true + ~job_name + ~build:latest_build + ~file:latest_artifact @ [ H.br () ] let make_jobs jobs = diff --git a/test/test_builder_db.ml b/test/test_builder_db.ml index 41d8b1a..ce2d257 100644 --- a/test/test_builder_db.ml +++ b/test/test_builder_db.ml @@ -227,7 +227,7 @@ let test_build_get_latest (module Db : CONN) = Db.find_opt Builder_db.Job.get_id_by_name job_name >>= fail_if_none >>= fun job_id -> Db.find_opt Builder_db.Build.get_latest_successful_with_binary (job_id, platform) >>| get_opt "no latest build" >>| fun (_id, meta, main_binary') -> - Alcotest.(check (option Testable.file)) "same main binary" main_binary' (Some main_binary2); + Alcotest.(check Testable.file) "same main binary" main_binary2 main_binary'; Alcotest.(check Testable.uuid) "same uuid" meta.uuid uuid' let test_build_get_previous (module Db : CONN) =