summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-08 22:07:47 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-08 22:07:47 +0200
commit98cda1b997442524ec8027fa1c1f9643eba6154b (patch)
tree685de333da66a56f0deb4d85d7f506a4515b2b98
parentf27a7128406f768fc8900144cafafe00aa2d7743 (diff)
downloadguix-98cda1b997442524ec8027fa1c1f9643eba6154b.tar.gz
hydra: guix-modular: Honor the 'systems' argument.
* build-aux/hydra/guix-modular.scm (hydra-jobs)[systems]: Define as in
gnu-system.scm.
Honor SYSTEMS.
-rw-r--r--build-aux/hydra/guix-modular.scm14
1 files changed, 5 insertions, 9 deletions
diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm
index 2885759df0..58e09e1831 100644
--- a/build-aux/hydra/guix-modular.scm
+++ b/build-aux/hydra/guix-modular.scm
@@ -57,14 +57,10 @@ for SYSTEM.  Use VERSION as the version identifier."
 (define (hydra-jobs store arguments)
   "Return Hydra jobs."
   (define systems
-    (match (filter-map (match-lambda
-                         (('system . value) value)
-                         (_ #f))
-                       arguments)
-      ((lst ..1)
-       lst)
-      (_
-       (list (%current-system)))))
+    (match (assoc-ref arguments 'systems)
+      (#f              %hydra-supported-systems)
+      ((lst ...)       lst)
+      ((? string? str) (call-with-input-string str read))))
 
   (define guix-checkout
     (or (assq-ref arguments 'guix)                ;Hydra on hydra
@@ -83,4 +79,4 @@ for SYSTEM.  Use VERSION as the version identifier."
                         (string-append "guix." system))))
              `(,name
                . ,(build-job store file version system))))
-         %hydra-supported-systems)))
+         systems)))