From df49fe2a13d933c640e3189413c5adfced1103c5 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
Date: Fri, 9 Jul 2021 12:07:24 +0200
Subject: [PATCH] ci: Add bootstrap packages to the core subset.

* gnu/ci.scm (%bootstrap-packages): New variable.
(cuirass-jobs): Add it to the core subset.
---
 gnu/ci.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/ci.scm b/gnu/ci.scm
index 428000472e..19ec5fbd7b 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -69,6 +69,7 @@ (define-module (gnu ci)
   #:export (derivation->job
             image->job
 
+            %bootstrap-packages
             %core-packages
             %cross-targets
             channel-source->package
@@ -148,6 +149,14 @@ (define %core-packages
         %guile-bootstrap-tarball
         %bootstrap-tarballs))
 
+(define %bootstrap-packages
+  ;; Return the list of bootstrap packages from the commencement module.
+  (filter package?
+          (module-map
+           (lambda (sym var)
+             (variable-ref var))
+           (resolve-module '(gnu packages commencement)))))
+
 (define (packages-to-cross-build target)
   "Return the list of packages to cross-build for TARGET."
   ;; Don't cross-build the bootstrap tarballs for MinGW.
@@ -508,7 +517,7 @@ (define source
            (map (lambda (package)
                   (package-job store (job-name package)
                                package system))
-                %core-packages)
+                (append %bootstrap-packages %core-packages))
            (cross-jobs store system)))
          ('guix
           ;; Build Guix modules only.