[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: ci: Try hard to build package replacements.
From: |
guix-commits |
Subject: |
04/04: ci: Try hard to build package replacements. |
Date: |
Mon, 26 Aug 2019 07:40:59 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f00ff8db9253b077ea625072d41f573cd1f73f3d
Author: Ludovic Courtès <address@hidden>
Date: Mon Aug 26 11:42:37 2019 +0200
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 aeebd4f..5d5a826 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