From e79f97289e4f7d0b9c0f91f781f6a7c1bbf8959c Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sun, 26 Nov 2023 22:50:36 +0000
Subject: Cancel builds before submitting new ones

This should handle the case where we want to cancel a build then submit a new
one for the same output.
---
 guix-qa-frontpage/manage-builds.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm
index f5195eb..9276e4f 100644
--- a/guix-qa-frontpage/manage-builds.scm
+++ b/guix-qa-frontpage/manage-builds.scm
@@ -710,6 +710,15 @@
                    category-name
                    category-value)
 
+    ;; Cancel builds first, as some of the builds we want to submit might be
+    ;; for the same outputs as ones we're going to cancel.
+    (cancel-builds-not-for-revision
+     build-coordinator
+     category-name
+     category-value
+     target-commit
+     build-ids-to-keep-set)
+
     (if (or (not build-limit)
             (< builds-to-submit-count
                build-limit))
@@ -728,14 +737,7 @@
         (simple-format #t "skipping ~A ~A as too many target derivations (~A)\n"
                        category-name
                        category-value
-                       builds-to-submit-count))
-
-    (cancel-builds-not-for-revision
-     build-coordinator
-     category-name
-     category-value
-     target-commit
-     build-ids-to-keep-set)))
+                       builds-to-submit-count))))
 
 (define %system-tests-that-change-every-revision
   '("btrfs-raid10-root-os"
-- 
cgit v1.2.3