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

Fix the unknown build counts on the builds pages

Browse source
This commit is contained in:
Christopher Baines 2019-12-23 21:30:36 +00:00
parent 474d942cbb
commit 5c643e09e5
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
guix-data-service/model/build.scm
View file

@ -43,8 +43,9 @@
(define query (define query
(string-append (string-append
" "
SELECT latest_build_status.status AS build_status, builds.build_server_id, COUNT(*) SELECT latest_build_status.status AS build_status, build_servers.id, COUNT(*)
FROM derivation_output_details_sets FROM derivation_output_details_sets
CROSS JOIN build_servers
" "
(if revision-commit (if revision-commit
" "
@ -61,7 +62,8 @@ INNER JOIN guix_revisions
" "
LEFT JOIN builds LEFT JOIN builds
ON builds.derivation_output_details_set_id = ON builds.derivation_output_details_set_id =
derivation_output_details_sets.id derivation_output_details_sets.id AND
builds.build_server_id = build_servers.id
LEFT JOIN LEFT JOIN
( (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
@ -76,7 +78,7 @@ ON builds.id = latest_build_status.build_id
"WHERE " "WHERE "
(string-join criteria " AND "))) (string-join criteria " AND ")))
" "
GROUP BY latest_build_status.status, builds.build_server_id GROUP BY latest_build_status.status, build_servers.id
ORDER BY status")) ORDER BY status"))
(map (match-lambda (map (match-lambda

8
guix-data-service/web/revision/html.scm
View file

@ -1180,12 +1180,10 @@ figure {
`(tr `(tr
(td ,(build-status-span status)) (td ,(build-status-span status))
,@(map (lambda (id) ,@(map (lambda (id)
`(td ,(if (string-null? status) `(td
(assq-ref counts-by-build-server-id ,(or (assq-ref counts-by-build-server-id
#f)
(or (assq-ref counts-by-build-server-id
id) id)
0)))) 0)))
(map cdr build-server-options))))) (map cdr build-server-options)))))
stats))))) stats)))))
(div (div