summaryrefslogtreecommitdiffstats
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
parentplatform: Add discovery support. (diff)
downloadguix-dd970122ddf3679482f658f73dd68307496c6215.tar.gz
guix-dd970122ddf3679482f658f73dd68307496c6215.tar.bz2
guix-dd970122ddf3679482f658f73dd68307496c6215.tar.xz
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>
-rw-r--r--etc/release-manifest.scm4
-rw-r--r--gnu/ci.scm15
2 files changed, 4 insertions, 15 deletions
diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index e7e64efda4..1098f491ba 100644
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -23,7 +23,7 @@
23(use-modules (gnu packages) 23(use-modules (gnu packages)
24 (guix packages) 24 (guix packages)
25 (guix profiles) 25 (guix profiles)
26 ((gnu ci) #:select (%cross-targets)) 26 ((gnu platform) #:select (targets))
27 ((gnu services xorg) #:select (%default-xorg-modules)) 27 ((gnu services xorg) #:select (%default-xorg-modules))
28 (guix utils) 28 (guix utils)
29 (srfi srfi-1) 29 (srfi srfi-1)
@@ -144,7 +144,7 @@ TARGET."
144 %packages-to-cross-build))) 144 %packages-to-cross-build)))
145 ;; XXX: Important bits like libsigsegv and libffi don't support 145 ;; XXX: Important bits like libsigsegv and libffi don't support
146 ;; RISCV at the moment, so don't require RISCV support. 146 ;; RISCV at the moment, so don't require RISCV support.
147 (delete "riscv64-linux-gnu" %cross-targets)))) 147 (delete "riscv64-linux-gnu" (targets)))))
148 148
149(define %cross-bootstrap-manifest 149(define %cross-bootstrap-manifest
150 (manifest 150 (manifest
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 @@
55 #:use-module (gnu packages multiprecision) 55 #:use-module (gnu packages multiprecision)
56 #:use-module (gnu packages make-bootstrap) 56 #:use-module (gnu packages make-bootstrap)
57 #:use-module (gnu packages package-management) 57 #:use-module (gnu packages package-management)
58 #:use-module (gnu platform)
58 #:use-module (gnu system) 59 #:use-module (gnu system)
59 #:use-module (gnu system image) 60 #:use-module (gnu system image)
60 #:use-module (gnu system vm) 61 #:use-module (gnu system vm)
@@ -71,7 +72,6 @@
71 image->job 72 image->job
72 73
73 %core-packages 74 %core-packages
74 %cross-targets
75 channel-source->package 75 channel-source->package
76 76
77 arguments->systems 77 arguments->systems
@@ -169,17 +169,6 @@ SYSTEM."
169 (drop-right %core-packages 6) 169 (drop-right %core-packages 6)
170 %core-packages)) 170 %core-packages))
171 171
172(define %cross-targets
173 '("mips64el-linux-gnu"
174 "arm-linux-gnueabihf"
175 "aarch64-linux-gnu"
176 "powerpc-linux-gnu"
177 "powerpc64le-linux-gnu"
178 "riscv64-linux-gnu"
179 "i586-pc-gnu" ;aka. GNU/Hurd
180 "i686-w64-mingw32"
181 "x86_64-w64-mingw32"))
182
183(define (cross-jobs store system) 172(define (cross-jobs store system)
184 "Return a list of cross-compilation jobs for SYSTEM." 173 "Return a list of cross-compilation jobs for SYSTEM."
185 (define (from-32-to-64? target) 174 (define (from-32-to-64? target)
@@ -221,7 +210,7 @@ SYSTEM."
221 package target system)) 210 package target system))
222 (packages-to-cross-build target))) 211 (packages-to-cross-build target)))
223 (remove (either from-32-to-64? same? pointless?) 212 (remove (either from-32-to-64? same? pointless?)
224 %cross-targets))) 213 (targets))))
225 214
226(define* (guix-jobs store systems #:key source commit) 215(define* (guix-jobs store systems #:key source commit)
227 "Return a list of jobs for Guix itself." 216 "Return a list of jobs for Guix itself."