guix
/
data-service
mirror of git://git.savannah.gnu.org/guix/data-service.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix ignoring canceled builds 

The previous changes only affected searching for package derivations, and they
also didn't work.
This commit is contained in:
Christopher Baines 2023-05-18 12:31:58 +01:00
parent 4208b5f148
commit 54c7a1a880
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix-data-service/model/derivation.scm
View File

@ -256,8 +256,11 @@ ORDER BY systems.system DESC,
EXISTS(
SELECT 1
FROM builds
INNER JOIN latest_build_status
ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id =
derivations_by_output_details_set.derivation_output_details_set_id
AND latest_build_status.status != 'canceled'
AND builds.build_server_id = " (number->string build-server-id) "
)"))
(or build-from-build-servers '()))
@ -268,8 +271,11 @@ EXISTS(
NOT EXISTS(
SELECT 1
FROM builds
INNER JOIN latest_build_status
ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id =
derivations_by_output_details_set.derivation_output_details_set_id
AND latest_build_status.status != 'canceled'
AND builds.build_server_id = " (number->string build-server-id) "
)"))
(or no-build-from-build-servers '()))
@ -477,7 +483,7 @@ EXISTS(
ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id =
derivations_by_output_details_set.derivation_output_details_set_id
AND latest_build_status != 'canceled'
AND latest_build_status.status != 'canceled'
AND builds.build_server_id = " (number->string build-server-id) "
)"))
(or build-from-build-servers '()))
@ -492,7 +498,7 @@ NOT EXISTS(
ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id =
derivations_by_output_details_set.derivation_output_details_set_id
AND latest_build_status != 'canceled'
AND latest_build_status.status != 'canceled'
AND builds.build_server_id = " (number->string build-server-id) "
)"))
(or no-build-from-build-servers '()))