summaryrefslogtreecommitdiff
path: root/gnu/ci.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-11-26 17:17:45 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-06 21:41:07 +0100
commitb5f8c2c88543158e8aca76aa98f9009f6b9e743a (patch)
tree5ef8083a9449e5de8d96dea369ade6c2b3137e88 /gnu/ci.scm
parent65ff85dcee76179f064aa533c6ca8de77a4ebe9a (diff)
downloadpatches-b5f8c2c88543158e8aca76aa98f9009f6b9e743a.tar
patches-b5f8c2c88543158e8aca76aa98f9009f6b9e743a.tar.gz
hydra: Compute jobs in an inferior.
Previously we would rely on auto-compilation of all the Guix modules. The complete evaluation would take ~15mn on berlin.guixsd.org and require lots of RAM. This approach should be faster since potentially only part of the modules are rebuilt. Furthermore, as a side-effect, it builds the derivations that 'guix pull' uses. * build-aux/hydra/gnu-system.scm: Remove 'eval-when' form. (hydra-jobs): New procedure. * gnu/ci.scm (package->alist, qemu-jobs, system-test-jobs) (tarball-jobs): Return strings for the 'license' field. * guix/self.scm (compiled-guix)[*cli-modules*]: Add (gnu ci).
Diffstat (limited to 'gnu/ci.scm')
-rw-r--r--gnu/ci.scm20
1 files changed, 15 insertions, 5 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 7db7e6062f..c071f21e0a 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -27,7 +27,8 @@
#:use-module (guix derivations)
#:use-module (guix monads)
#:use-module (guix ui)
- #:use-module ((guix licenses) #:select (gpl3+))
+ #:use-module ((guix licenses)
+ #:select (gpl3+ license? license-name))
#:use-module ((guix utils) #:select (%current-system))
#:use-module ((guix scripts system) #:select (read-operating-system))
#:use-module ((guix scripts pack)
@@ -69,7 +70,16 @@
#:graft? #f)))
(description . ,(package-synopsis package))
(long-description . ,(package-description package))
- (license . ,(package-license 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)))))
+
(home-page . ,(package-home-page package))
(maintainers . ("bug-guix@gnu.org"))
(max-silent-time . ,(or (assoc-ref (package-properties package)
@@ -133,7 +143,7 @@ SYSTEM."
(description . "Stand-alone QEMU image of the GNU system")
(long-description . "This is a demo stand-alone QEMU image of the GNU
system.")
- (license . ,gpl3+)
+ (license . ,(license-name gpl3+))
(max-silent-time . 600)
(timeout . 3600)
(home-page . ,%guix-home-page-url)
@@ -194,7 +204,7 @@ system.")
(description . ,(format #f "GuixSD '~a' system test"
(system-test-name test)))
(long-description . ,(system-test-description test))
- (license . ,gpl3+)
+ (license . ,(license-name gpl3+))
(max-silent-time . 600)
(timeout . 3600)
(home-page . ,%guix-home-page-url)
@@ -217,7 +227,7 @@ system.")
(description . "Stand-alone binary Guix tarball")
(long-description . "This is a tarball containing binaries of Guix and
all its dependencies, and ready to be installed on non-GuixSD distributions.")
- (license . ,gpl3+)
+ (license . ,(license-name gpl3+))
(home-page . ,%guix-home-page-url)
(maintainers . ("bug-guix@gnu.org"))))