From cbfcbb79df41c2485716e12874424215d9840e3d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Mar 2021 19:30:36 +0100 Subject: 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(-) (limited to 'gnu/ci.scm') 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. -- cgit 1.4.1