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_build_object(
'build_server_id', builds.build_server_id,
'build_server_build_id', builds.build_server_build_id,
'status', latest_build_status.status,
'timestamp', latest_build_status.timestamp,
'build_for_equivalent_derivation',
@ -429,6 +430,7 @@ SELECT package_version,
JSON_AGG(
json_build_object(
'build_server_id', builds.build_server_id,
'build_server_build_id', builds.build_server_build_id,
'derivation_file_name', builds.derivation_file_name,
'status', latest_build_status.status,
'timestamp', latest_build_status.timestamp

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

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

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

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