diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2022-05-02 12:58:00 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-05-22 15:15:33 +0200 |
| commit | dd970122ddf3679482f658f73dd68307496c6215 (patch) | |
| tree | 371f83cef7de3bde488695e6fbec0754f52bf89b | |
| parent | 4f2320f79d97410ed6568c0c65054b71a1ca59c2 (diff) | |
| download | guix-dd970122ddf3679482f658f73dd68307496c6215.tar guix-dd970122ddf3679482f658f73dd68307496c6215.tar.gz | |
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.scm | 4 | ||||
| -rw-r--r-- | gnu/ci.scm | 15 |
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 @@ (use-modules (gnu packages) (guix packages) (guix profiles) - ((gnu ci) #:select (%cross-targets)) + ((gnu platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) (guix utils) (srfi srfi-1) @@ -144,7 +144,7 @@ TARGET." %packages-to-cross-build))) ;; XXX: Important bits like libsigsegv and libffi don't support ;; RISCV at the moment, so don't require RISCV support. - (delete "riscv64-linux-gnu" %cross-targets)))) + (delete "riscv64-linux-gnu" (targets))))) (define %cross-bootstrap-manifest (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 @@ #: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." |