Merge branch 'master' into core-updates

1 files 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