branch master updated: ci: Support packages with multiple channels.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new cbfcbb7  ci: Support packages with multiple channels.
cbfcbb7 is described below

commit cbfcbb79df41c2485716e12874424215d9840e3d
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sun Mar 14 19:30:36 2021 +0100

    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.
---
 gnu/ci.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/ci.scm b/gnu/ci.scm
index 664cabf..acd05a1 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.