cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include the status of derivations

Browse source 
On the comparison page.
This commit is contained in:
Christopher Baines 2019-03-06 22:58:05 +00:00
parent 7a90afe980
commit e656b0967b
Signed by: cbaines
GPG key ID: 5E28A33B0B84F577
4 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
guix-data-service/web/controller.scm
View file

@ -142,27 +142,27 @@
base-revision-id
target-revision-id))))
(let ((base-derivations
(package-data-vhash->derivations
(package-data-vhash->derivations-and-build-status
conn
base-packages-vhash))
(target-derivations
(package-data-vhash->derivations
(package-data-vhash->derivations-and-build-status
conn
target-packages-vhash)))
(cond
((eq? content-type 'json)
(render-json
`((base . ((commit . ,base-commit)
(derivations . ,base-derivations)))
(target . ((commit . ,target-commit)
(derivations . ,target-derivations))))))
(else
(apply render-html
(compare/derivations
base-commit
target-commit
base-derivations
target-derivations)))))))
(cond
((eq? content-type 'json)
(render-json
`((base . ((commit . ,base-commit)
(derivations . ,base-derivations)))
(target . ((commit . ,target-commit)
(derivations . ,target-derivations))))))
(else
(apply render-html
(compare/derivations
base-commit
target-commit
base-derivations
target-derivations)))))))
(define (render-compare/packages content-type
conn

16
guix-data-service/web/view/html.scm
View file

@ -326,13 +326,15 @@
(@ (class "table"))
(thead
(tr
(th (@ (class "col-md-12")) "File Name")))
(th (@ (class "col-md-8")) "File Name")
(th (@ (class "col-md-4")) "Build status")))
(tbody
,@(map
(match-lambda
((id file-name)
((id file-name build-status)
`(tr
(td ,file-name))))
(td ,file-name)
(td ,build-status))))
base-derivations))))
(div
(@ (class "row"))
@ -344,13 +346,15 @@
(@ (class "table"))
(thead
(tr
(th (@ (class "col-md-12")) "File Name")))
(th (@ (class "col-md-8")) "File Name")
(th (@ (class "col-md-4")) "Build status")))
(tbody
,@(map
(match-lambda
((id file-name)
((id file-name build-status)
`(tr
(td ,file-name))))
(td ,file-name)
(td ,build-status))))
target-derivations))))))))
(define (compare/packages base-commit