summary refs log tree commit diff
path: root/build-aux/hydra
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-07-25 17:44:35 +0200
committerLudovic Courtès <ludo@gnu.org>2017-07-25 17:46:17 +0200
commit386f5415569604d3c4c83823ffc6b71b3012670c (patch)
tree949d891ade9f2d08b955eb3db3f20a2421652548 /build-aux/hydra
parent06ce8e568059caa95006913c062a3df6cf07e943 (diff)
downloadguix-386f5415569604d3c4c83823ffc6b71b3012670c.tar.gz
hydra: Add 'guix.SYSTEM' jobs.
* build-aux/hydra/guix.scm (package->alist): Disable grafting.
(hydra-jobs): Return 'guix.SYSTEM' jobs in addition to 'tarball'.
Diffstat (limited to 'build-aux/hydra')
-rw-r--r--build-aux/hydra/guix.scm20
1 files changed, 18 insertions, 2 deletions
diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm
index 80831c4616..659b8bfbc1 100644
--- a/build-aux/hydra/guix.scm
+++ b/build-aux/hydra/guix.scm
@@ -43,6 +43,7 @@
 (use-modules (guix store)
              (guix packages)
              (guix utils)
+             (guix grafts)
              (guix derivations)
              (guix build-system gnu)
              (gnu packages package-management)
@@ -59,7 +60,9 @@
                          #:optional (package-derivation package-derivation))
   "Convert PACKAGE to an alist suitable for Hydra."
   `((derivation . ,(derivation-file-name
-                    (package-derivation store package system)))
+                    (parameterize ((%graft? #f))
+                      (package-derivation store package system
+                                          #:graft? #f))))
     (description . ,(package-synopsis package))
     (long-description . ,(package-description package))
     (license . ,(package-license package))
@@ -85,6 +88,19 @@
   (let ((file (assq-ref guix-checkout 'file-name)))
     (format (current-error-port) "using checkout ~s (~s)~%"
             guix-checkout file)
+
     `((tarball . ,(cute package->alist store
                         (dist-package guix file)
-                        (%current-system))))))
+                        (%current-system)))
+
+      ,@(map (lambda (system)
+               (let ((name (string->symbol
+                            (string-append "guix." system))))
+                 `(,name
+                   . ,(cute package->alist store
+                            (package
+                              (inherit guix)
+                              (version "latest")
+                              (source file))
+                            system))))
+             %hydra-supported-systems))))