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

Fix various issues linking to builds

Browse source
This commit is contained in:
Christopher Baines 2021-01-03 10:54:45 +00:00
parent e476239479
commit 48cdf102fe
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guix-data-service/model/package.scm
View file

@ -346,6 +346,7 @@ SELECT package_version,
JSON_AGG( JSON_AGG(
json_build_object( json_build_object(
'build_server_id', builds.build_server_id, 'build_server_id', builds.build_server_id,
'build_server_build_id', builds.build_server_build_id,
'status', latest_build_status.status, 'status', latest_build_status.status,
'timestamp', latest_build_status.timestamp, 'timestamp', latest_build_status.timestamp,
'build_for_equivalent_derivation', 'build_for_equivalent_derivation',
@ -429,6 +430,7 @@ SELECT package_version,
JSON_AGG( JSON_AGG(
json_build_object( json_build_object(
'build_server_id', builds.build_server_id, 'build_server_id', builds.build_server_id,
'build_server_build_id', builds.build_server_build_id,
'derivation_file_name', builds.derivation_file_name, 'derivation_file_name', builds.derivation_file_name,
'status', latest_build_status.status, 'status', latest_build_status.status,
'timestamp', latest_build_status.timestamp 'timestamp', latest_build_status.timestamp

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

@ -523,9 +523,9 @@
build-server-id))) build-server-id)))
(dd (dd
(a (@ (href (a (@ (href
,(simple-format ,(build-url
#f "/build-server/~A/build?derivation_file_name=~A"
build-server-id build-server-id
(assoc-ref build "build_server_build_id")
derivation-file-name))) derivation-file-name)))
,(build-status-alist->build-icon build)))))) ,(build-status-alist->build-icon build))))))
builds))) builds)))
@ -773,9 +773,9 @@
build-server-id))) build-server-id)))
(dd (dd
(a (@ (href (a (@ (href
,(simple-format ,(build-url
#f "/build-server/~A/build?derivation_file_name=~A"
build-server-id build-server-id
(assoc-ref build "build_server_build_id")
(assoc-ref build "derivation_file_name")))) (assoc-ref build "derivation_file_name"))))
,(build-status-alist->build-icon build)))))) ,(build-status-alist->build-icon build))))))
builds))) builds)))

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

@ -297,13 +297,12 @@
(@ (class "list-inline")) (@ (class "list-inline"))
,@(map (lambda (build) ,@(map (lambda (build)
`(li `(li
(a (@ (href `(a (@ (href ,(build-url
,(simple-format build-server-id
#f "/build-server/~A/build?derivation_file_name=~A" (assoc-ref build
(assoc-ref build "build_server_id") "build_server_build_id")
file-name))) derivation-file-name)))
,(build-status-span ,(build-status-alist->build-icon build))))
(assoc-ref build "status")))))
builds)))))) builds))))))
derivations))))) derivations)))))
(div (div
@ -922,11 +921,11 @@
(lambda (build) (lambda (build)
(let ((build-server-id (let ((build-server-id
(assoc-ref build "build_server_id"))) (assoc-ref build "build_server_id")))
`(a (@ (href `(a (@ (href ,(build-url
,(simple-format build-server-id
#f "/build-server/~A/build?derivation_file_name=~A" (assoc-ref build
build-server-id "build_server_build_id")
derivation-file-name))) derivation-file-name)))
,(build-status-alist->build-icon build)))) ,(build-status-alist->build-icon build))))
builds))))) builds)))))
system-tests))))))))) system-tests)))))))))
@ -972,11 +971,11 @@
(lambda (build) (lambda (build)
(let ((build-server-id (let ((build-server-id
(assoc-ref build "build_server_id"))) (assoc-ref build "build_server_id")))
`(a (@ (href `(a (@ (href ,(build-url
,(simple-format build-server-id
#f "/build-server/~A/build?derivation_file_name=~A" (assoc-ref build
build-server-id "build_server_build_id")
derivation-file-name))) derivation-file-name)))
,(build-status-alist->build-icon build)))) ,(build-status-alist->build-icon build))))
builds))))) builds)))))
channel-instances))))))))) channel-instances)))))))))