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

Add a lookup_builds field to the build_servers table

Browse source 
This is to allow for build servers where only the substitutes should be
queried, and it shouldn't be assumed that they're running Cuirass.
This commit is contained in:
Christopher Baines 2020-05-24 17:02:53 +01:00
parent f11421824d
commit b6754c8a4c
12 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
guix-data-service/web/revision/controller.scm
View file

@ -77,7 +77,7 @@
(lambda (v)
(let ((build-servers (select-build-servers conn)))
(or (any (match-lambda
((id url lookup-all-derivations?)
((id url lookup-all-derivations? lookup-builds?)
(if (eq? (string->number v)
id)
id
@ -454,11 +454,7 @@
(let ((substitute-availability
(select-package-output-availability-for-revision conn commit-hash))
(build-server-urls
(group-to-alist
(match-lambda
((id url lookup-all-derivations)
(cons id url)))
(select-build-servers conn))))
(select-build-server-urls-by-id conn)))
(case (most-appropriate-mime-type
'(application/json text/html)
mime-types)
@ -796,11 +792,7 @@
#:after-name (assq-ref query-parameters 'after_name)
#:include-builds? (member "builds" fields))))
(build-server-urls
(group-to-alist
(match-lambda
((id url lookup-all-derivations)
(cons id url)))
(select-build-servers conn)))
(select-build-server-urls-by-id conn))
(show-next-page?
(if all-results
#f
@ -898,11 +890,7 @@
#:limit-results limit-results
#:after-path (assq-ref query-parameters 'after_path)))
(build-server-urls
(group-to-alist
(match-lambda
((id url lookup-all-derivations)
(cons id url)))
(select-build-servers conn)))
(select-build-server-urls-by-id conn))
(show-next-page?
(if all-results
#f
@ -960,7 +948,8 @@
(valid-targets->options
(valid-targets conn))
(map (match-lambda
((id url lookup-all-derivations)
((id url lookup-all-derivations
lookup-builds)
(cons url id)))
(select-build-servers conn))
(select-build-stats