branch master updated: Ignore canceled builds when querying package derivations

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository data-service.

The following commit(s) were added to refs/heads/master by this push:
     new 4208b5f  Ignore canceled builds when querying package derivations
4208b5f is described below

commit 4208b5f1480b7f89db0a829f3536c6db2798f2f5
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu May 18 11:25:14 2023 +0100

    Ignore canceled builds when querying package derivations
    
    This will help when using this to submit builds, since you won't end up
    ignoring derivations with canceled builds.
---
 guix-data-service/model/derivation.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guix-data-service/model/derivation.scm 
b/guix-data-service/model/derivation.scm
index 9f9a3fb..693f11a 100644
--- a/guix-data-service/model/derivation.scm
+++ b/guix-data-service/model/derivation.scm
@@ -473,8 +473,11 @@ ORDER BY derivations.file_name
 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 != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or build-from-build-servers '()))
@@ -485,8 +488,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 != 'canceled'
     AND builds.build_server_id = " (number->string build-server-id) "
 )"))
           (or no-build-from-build-servers '()))