summaryrefslogtreecommitdiff
path: root/gnu/ci.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2022-05-02 12:58:00 +0200
committerMathieu Othacehe <othacehe@gnu.org>2022-05-22 15:15:33 +0200
commitdd970122ddf3679482f658f73dd68307496c6215 (patch)
tree371f83cef7de3bde488695e6fbec0754f52bf89b /gnu/ci.scm
parent4f2320f79d97410ed6568c0c65054b71a1ca59c2 (diff)
ci: Do not rely on hardcoded cross-targets lists.
* gnu/ci.scm (%cross-targets): Remove it ... (cross-jobs): ... and use the targets procedure instead. * etc/release-manifest.scm: Adapt it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'gnu/ci.scm')
-rw-r--r--gnu/ci.scm15
1 files changed, 2 insertions, 13 deletions
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 35fd583f75..9de1b54fc8 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -55,6 +55,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management)
+ #:use-module (gnu platform)
#:use-module (gnu system)
#:use-module (gnu system image)
#:use-module (gnu system vm)
@@ -71,7 +72,6 @@
image->job
%core-packages
- %cross-targets
channel-source->package
arguments->systems
@@ -169,17 +169,6 @@ SYSTEM."
(drop-right %core-packages 6)
%core-packages))
-(define %cross-targets
- '("mips64el-linux-gnu"
- "arm-linux-gnueabihf"
- "aarch64-linux-gnu"
- "powerpc-linux-gnu"
- "powerpc64le-linux-gnu"
- "riscv64-linux-gnu"
- "i586-pc-gnu" ;aka. GNU/Hurd
- "i686-w64-mingw32"
- "x86_64-w64-mingw32"))
-
(define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target)
@@ -221,7 +210,7 @@ SYSTEM."
package target system))
(packages-to-cross-build target)))
(remove (either from-32-to-64? same? pointless?)
- %cross-targets)))
+ (targets))))
(define* (guix-jobs store systems #:key source commit)
"Return a list of jobs for Guix itself."