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

Handle jobs without successful build in migrations

Browse source 
The migrations migrate-2021-06-29 and migrate-2021-06-30 would not apply
if a job exists without any successful build. Now the migrations script
silently skips jobs without succesful builds.
This commit is contained in:
Reynir Björnsson 2021-07-01 10:50:00 +02:00
parent bd0ab7f554
commit 37e68f91f4
2 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/migrations/m20210629.ml
View file

@ -34,7 +34,7 @@ let jobs =
"SELECT id FROM job" "SELECT id FROM job"
let latest_successful_build = let latest_successful_build =
Caqti_request.find Caqti_request.find_opt
Builder_db.Rep.id Builder_db.Rep.id
Builder_db.Rep.id Builder_db.Rep.id
{| SELECT b.id {| SELECT b.id
@ -138,7 +138,10 @@ let migrate datadir (module Db : Caqti_blocking.CONNECTION) =
Db.find find_tag "description" >>= fun descr_id -> Db.find find_tag "description" >>= fun descr_id ->
Db.collect_list jobs () >>= fun jobs -> Db.collect_list jobs () >>= fun jobs ->
Grej.list_iter_result (fun job -> Grej.list_iter_result (fun job ->
Db.find latest_successful_build job >>= fun build -> Db.find_opt latest_successful_build job >>= function
| None ->
Ok ()
| Some build ->
Db.collect_list build_artifacts build >>= fun artifacts -> Db.collect_list build_artifacts build >>= fun artifacts ->
List.fold_left (fun acc (fpath, lpath) -> List.fold_left (fun acc (fpath, lpath) ->
acc >>= fun acc -> acc >>= fun acc ->

6
bin/migrations/m20210630.ml
View file

@ -10,7 +10,7 @@ let jobs =
"SELECT id FROM job" "SELECT id FROM job"
let latest_successful_build = let latest_successful_build =
Caqti_request.find Caqti_request.find_opt
Builder_db.Rep.id Builder_db.Rep.id
Builder_db.Rep.id Builder_db.Rep.id
{| SELECT b.id {| SELECT b.id
@ -63,7 +63,9 @@ let migrate datadir (module Db : Caqti_blocking.CONNECTION) =
Db.find find_tag "readme.md" >>= fun readme_id -> Db.find find_tag "readme.md" >>= fun readme_id ->
Db.collect_list jobs () >>= fun jobs -> Db.collect_list jobs () >>= fun jobs ->
Grej.list_iter_result (fun job -> Grej.list_iter_result (fun job ->
Db.find latest_successful_build job >>= fun build -> Db.find_opt latest_successful_build job >>= function
| None -> Ok ()
| Some build ->
Db.collect_list build_artifacts build >>= fun artifacts -> Db.collect_list build_artifacts build >>= fun artifacts ->
List.fold_left (fun acc (fpath, lpath) -> List.fold_left (fun acc (fpath, lpath) ->
acc >>= fun acc -> acc >>= fun acc ->