From 24a2aa3265ac278e48e98f4435c3dc8664acb3ba Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 3 Sep 2022 09:30:04 +0100
Subject: Lots of changes

---
 guix-qa-frontpage/manage-builds.scm | 68 +++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 30 deletions(-)

(limited to 'guix-qa-frontpage/manage-builds.scm')

diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm
index b6541d9..a905fb7 100644
--- a/guix-qa-frontpage/manage-builds.scm
+++ b/guix-qa-frontpage/manage-builds.scm
@@ -8,7 +8,15 @@
   #:use-module (guix-qa-frontpage database)
   #:use-module (guix-qa-frontpage patchwork)
   #:use-module (guix-qa-frontpage guix-data-service)
-  #:export (start-submit-patch-builds-thread))
+  #:export (%systems-to-submit-builds-for
+
+            start-submit-patch-builds-thread))
+
+(define %systems-to-submit-builds-for
+  '("x86_64-linux"
+    "i686-linux"
+    "aarch64-linux"
+    "armhf-linux"))
 
 (define (start-submit-patch-builds-thread database
                                           build-coordinator
@@ -30,30 +38,36 @@
                             "considering submitting builds for issue ~A\n"
                             issue-number)
 
-             (let ((derivation-changes
-                    change-details
-                    (with-sqlite-cache
-                     database
-                     'derivation-changes
-                     patch-series-derivation-changes
-                     #:args
-                     (list (patch-series-derivation-changes-url series))
-                     #:ttl 6000)))
+             (let ((derivation-changes-url
+                    (patch-series-derivation-changes-url series)))
 
-               (when derivation-changes
-                 (let ((target-commit
-                        (assoc-ref
-                         (assoc-ref
-                          (assoc-ref change-details
-                                     "revisions")
-                          "target")
-                         "commit")))
+               (if derivation-changes-url
+                   (let ((derivation-changes
+                          change-details
+                          (with-sqlite-cache
+                           database
+                           'derivation-changes
+                           patch-series-derivation-changes
+                           #:args
+                           (list derivation-changes-url)
+                           #:ttl 6000)))
 
-                   (submit-builds-for-issue build-coordinator
-                                            guix-data-service
-                                            issue-number
-                                            derivation-changes
-                                            target-commit))))))
+                     (when derivation-changes
+                       (let ((target-commit
+                              (assoc-ref
+                               (assoc-ref
+                                (assoc-ref change-details
+                                           "revisions")
+                                "target")
+                               "commit")))
+
+                         (submit-builds-for-issue build-coordinator
+                                                  guix-data-service
+                                                  issue-number
+                                                  derivation-changes
+                                                  target-commit))))
+                   (simple-format #t "no derivation changes url for issue ~A\n"
+                                  issue-number)))))
           (take series 10)))))))
 
 (define* (submit-build build-coordinator guix-data-service derivation
@@ -133,12 +147,6 @@
                                   issue
                                   derivation-changes
                                   target-commit)
-  (define systems
-    '("x86_64-linux"
-      "i686-linux"
-      "aarch64-linux"
-      "armhf-linux"))
-
   (define target-derivations
     (fold (lambda (package result)
             (fold
@@ -146,7 +154,7 @@
                (if (and (string=? (assoc-ref change "target")
                                   "")
                         (member (assoc-ref change "system")
-                                systems)
+                                %systems-to-submit-builds-for)
                         (eq? (vector-length
                               (assoc-ref change "builds"))
                              0))
-- 
cgit v1.2.3