summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-03-14 19:30:36 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-03-14 19:43:35 +0100
commitcbfcbb79df41c2485716e12874424215d9840e3d (patch)
tree82203ccfaa44603fe5543c311c04fedfa1226f68
parentb76762a9b7f723ec59302927dde488c80f7f4ee9 (diff)
downloadguix-cbfcbb79df41c2485716e12874424215d9840e3d.tar.gz
ci: Support packages with multiple channels.
This is a follow-up of 61a1165340a8bcc45550259edca25275d899fe09. For packages
provided by external channels, package-channels procedure will return at least
two channels. Take it into account.

* gnu/ci.scm (cuirass-jobs): Fix channels subset argument.
-rw-r--r--gnu/ci.scm9
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 664cabfec6..acd05a18b4 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -527,11 +527,10 @@ valid."
           (let ((all (all-packages)))
             (filter-map
              (lambda (package)
-               (match (package-channels package)
-                 ((channel . _)
-                  (and (member (channel-name channel) channels)
-                       (package->job store package system)))
-                 (else #f)))
+               (any (lambda (channel)
+                      (and (member (channel-name channel) channels)
+                           (package->job store package system)))
+                    (package-channels package)))
              all)))
          (('packages . rest)
           ;; Build selected list of packages only.