From 20dfbe471db5f9a28bbe977383b9c5830632dd64 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Wed, 13 Dec 2023 17:40:29 +0000
Subject: Make sure builds are canceled

---
 guix-qa-frontpage/manage-builds.scm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm
index 9276e4f..21ade0d 100644
--- a/guix-qa-frontpage/manage-builds.scm
+++ b/guix-qa-frontpage/manage-builds.scm
@@ -174,7 +174,8 @@
          (lambda (issue-number)
            (cancel-builds build-coordinator
                           "issue"
-                          issue-number)
+                          issue-number
+                          #:relationship 'unset)
            (delete-from-builds-to-cancel-later
             database
             "issue"
@@ -358,7 +359,8 @@
      (lambda (branch)
        (cancel-builds build-coordinator
                       "branch"
-                      branch)
+                      branch
+                      #:relationship 'unset)
        (delete-from-builds-to-cancel-later
         database
         "branch"
@@ -497,9 +499,10 @@
    #f
    criteria))
 
-(define (cancel-builds build-coordinator
-                       category-name
-                       category-value)
+(define* (cancel-builds build-coordinator
+                        category-name
+                        category-value
+                        #:key (relationship 'no-dependent-builds))
   (simple-format (current-error-port)
                  "canceling builds for ~A ~A\n"
                  category-name
@@ -513,7 +516,11 @@
          (lambda ()
            (send-cancel-build-request build-coordinator
                                       (assoc-ref build-details "uuid")
-                                      #:skip-updating-derived-priorities? #t))
+                                      #:skip-updating-derived-priorities? #t
+                                      #:ignore-if-build-required-by-another?
+                                      (if (eq? relationship 'unset)
+                                          #f
+                                          #t)))
          #:times 6
          #:delay 15)
         (simple-format (current-error-port)
@@ -526,7 +533,7 @@
          (value . ,category-value)))
       #:canceled #f
       #:processed #f
-      #:relationship 'no-dependent-builds))
+      #:relationship relationship))
    #:timeout 60)
   (simple-format (current-error-port)
                  "finshed canceling builds for ~A ~A\n"
-- 
cgit v1.2.3