From f00ff8db9253b077ea625072d41f573cd1f73f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 11:42:37 +0200 Subject: [PATCH] ci: Try hard to build package replacements. The "ghostscript" replacements introduced in 0b859092a7346f3b4d0a3a4dac878fd64fd70b79 would not be built because they have the same name as the original packages. * gnu/ci.scm (all-packages): Return the replacement of PACKAGE before PACKAGE. --- gnu/ci.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index aeebd4f14b..5d5a826647 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -331,8 +331,12 @@ valid." "Return the list of packages to build." (define (adjust package result) (cond ((package-replacement package) - (cons* package ;build both - (package-replacement package) + ;; XXX: If PACKAGE and its replacement have the same name/version, + ;; then both Cuirass jobs will have the same name, which + ;; effectively means that the second one will be ignored. Thus, + ;; return the replacement first. + (cons* (package-replacement package) ;build both + package result)) ((package-superseded package) result) ;don't build it