ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: Do not rely on hardcoded cross-targets lists.

Browse source 
* 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>
This commit is contained in:
Mathieu Othacehe 2022-05-02 12:58:00 +02:00
parent 4f2320f79d
commit dd970122dd
No known key found for this signature in database
GPG key ID: 8354763531769CA6
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/release-manifest.scm
View file

@ -23,7 +23,7 @@
(use-modules (gnu packages) (use-modules (gnu packages)
(guix packages) (guix packages)
(guix profiles) (guix profiles)
((gnu ci) #:select (%cross-targets)) ((gnu platform) #:select (targets))
((gnu services xorg) #:select (%default-xorg-modules)) ((gnu services xorg) #:select (%default-xorg-modules))
(guix utils) (guix utils)
(srfi srfi-1) (srfi srfi-1)
@ -144,7 +144,7 @@ (define %cross-manifest
%packages-to-cross-build))) %packages-to-cross-build)))
;; XXX: Important bits like libsigsegv and libffi don't support ;; XXX: Important bits like libsigsegv and libffi don't support
;; RISCV at the moment, so don't require RISCV 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 (define %cross-bootstrap-manifest
(manifest (manifest

15
gnu/ci.scm
View file

@ -55,6 +55,7 @@ (define-module (gnu ci)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap) #:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management) #:use-module (gnu packages package-management)
#:use-module (gnu platform)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system image) #:use-module (gnu system image)
#:use-module (gnu system vm) #:use-module (gnu system vm)
@ -71,7 +72,6 @@ (define-module (gnu ci)
image->job image->job
%core-packages %core-packages
%cross-targets
channel-source->package channel-source->package
arguments->systems arguments->systems
@ -169,17 +169,6 @@ (define (packages-to-cross-build target)
(drop-right %core-packages 6) (drop-right %core-packages 6)
%core-packages)) %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) (define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM." "Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target) (define (from-32-to-64? target)
@ -221,7 +210,7 @@ (define (either proc1 proc2 proc3)
package target system)) package target system))
(packages-to-cross-build target))) (packages-to-cross-build target)))
(remove (either from-32-to-64? same? pointless?) (remove (either from-32-to-64? same? pointless?)
%cross-targets))) (targets))))
(define* (guix-jobs store systems #:key source commit) (define* (guix-jobs store systems #:key source commit)
"Return a list of jobs for Guix itself." "Return a list of jobs for Guix itself."