ci: Convert license to text.

[jackhill/guix/guix.git] / gnu / ci.scm

diff --git a/gnu/ci.scm b/gnu/ci.scm
index c985cd6..1d16805 100644 (file)
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -56,6 +56,7 @@
   #:use-module (gnu system vm)
   #:use-module (gnu system install)
   #:use-module (gnu system images hurd)
+  #:use-module (gnu system images pine64)
   #:use-module (gnu tests)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -78,20 +79,17 @@
     (let ((drv (package-derivation store package system
                                    #:graft? #f)))
       `((derivation . ,(derivation-file-name drv))
+        (log . ,(log-file store (derivation-file-name drv)))
+        (outputs . ,(filter-map (lambda (res)
+                                  (match res
+                                    ((name . path)
+                                     `(,name . ,path))))
+                                (derivation->output-paths drv)))
         (nix-name . ,(derivation-name drv))
         (system . ,(derivation-system drv))
         (description . ,(package-synopsis package))
         (long-description . ,(package-description package))
-
-        ;; XXX: Hydra ignores licenses that are not a <license> structure or a
-        ;; list thereof.
-        (license . ,(let loop ((license (package-license package)))
-                      (match license
-                        ((? license?)
-                         (license-name license))
-                        ((lst ...)
-                         (map loop license)))))
-
+        (license . ,(and=> (package-license package) license-name))
         (home-page . ,(package-home-page package))
         (maintainers . ("bug-guix@gnu.org"))
         (max-silent-time . ,(or (assoc-ref (package-properties package)
@@ -197,12 +195,19 @@ SYSTEM."
   '("x86_64-linux" "i686-linux"))
 
 (define %guix-system-images
-  (list hurd-barebones-qcow2-image))
+  (list hurd-barebones-qcow2-image
+        pine64-barebones-raw-image))
 
 (define (image-jobs store system)
   "Return a list of jobs that build images for SYSTEM."
   (define (->alist drv)
     `((derivation . ,(derivation-file-name drv))
+      (log . ,(log-file store (derivation-file-name drv)))
+      (outputs . ,(filter-map (lambda (res)
+                                (match res
+                                  ((name . path)
+                                   `(,name . ,path))))
+                              (derivation->output-paths drv)))
       (nix-name . ,(derivation-name drv))
       (system . ,(derivation-system drv))
       (description . "Stand-alone image of the GNU system")
@@ -308,6 +313,12 @@ system.")
             (system-test-value test))))
 
       `((derivation . ,(derivation-file-name drv))
+        (log . ,(log-file store (derivation-file-name drv)))
+        (outputs . ,(filter-map (lambda (res)
+                                  (match res
+                                    ((name . path)
+                                     `(,name . ,path))))
+                                (derivation->output-paths drv)))
         (nix-name . ,(derivation-name drv))
         (system . ,(derivation-system drv))
         (description . ,(format #f "Guix '~a' system test"
@@ -339,6 +350,12 @@ system.")
   "Return Hydra jobs to build the self-contained Guix binary tarball."
   (define (->alist drv)
     `((derivation . ,(derivation-file-name drv))
+      (log . ,(log-file store (derivation-file-name drv)))
+      (outputs . ,(filter-map (lambda (res)
+                                (match res
+                                  ((name . path)
+                                   `(,name . ,path))))
+                              (derivation->output-paths drv)))
       (nix-name . ,(derivation-name drv))
       (system . ,(derivation-system drv))
       (description . "Stand-alone binary Guix tarball")