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

Revert "ci: Build Guix System images."

Browse source 
This reverts commit eda3fcfb46.

This change broke evaluations on CI:

  @ build-succeeded /gnu/store/991738x97ff1f8181a7p1pflqwkgagm8-profile.drv -
  ERROR: In procedure read:
  In procedure scm_lreadr: #<unknown port>:16:144: Unknown # object: #\<
This commit is contained in:
Ludovic Courtès 2020-06-25 01:27:55 +02:00
parent a2991de0f4
commit 1189f405ae
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
gnu/ci.scm
View file

@ -53,7 +53,6 @@ (define-module (gnu ci)
#:use-module (gnu system image) #:use-module (gnu system image)
#:use-module (gnu system vm) #:use-module (gnu system vm)
#:use-module (gnu system install) #:use-module (gnu system install)
#:use-module (gnu system images hurd)
#:use-module (gnu tests) #:use-module (gnu tests)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -186,21 +185,18 @@ (define (either proc1 proc2 proc3)
(remove (either from-32-to-64? same? pointless?) (remove (either from-32-to-64? same? pointless?)
%cross-targets))) %cross-targets)))
;; Architectures that are able to build or cross-build Guix System images. (define %guixsd-supported-systems
;; This does not mean that other architectures are not supported, only that '("x86_64-linux" "i686-linux" "armhf-linux"))
;; they are often not fast enough to support Guix System images building.
(define %guix-system-supported-systems
'("x86_64-linux" "i686-linux"))
(define %guix-system-images (define %u-boot-systems
(list hurd-barebones-disk-image)) '("armhf-linux"))
(define (image-jobs store system) (define (qemu-jobs store system)
"Return a list of jobs that build images for SYSTEM." "Return a list of jobs that build QEMU images for SYSTEM."
(define (->alist drv) (define (->alist drv)
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(description . "Stand-alone image of the GNU system") (description . "Stand-alone QEMU image of the GNU system")
(long-description . "This is a demo stand-alone image of the GNU (long-description . "This is a demo stand-alone QEMU image of the GNU
system.") system.")
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
(max-silent-time . 600) (max-silent-time . 600)
@ -215,34 +211,30 @@ (define (->job name drv)
(parameterize ((%graft? #f)) (parameterize ((%graft? #f))
(->alist drv)))))) (->alist drv))))))
(define (build-image image)
(run-with-store store
(mbegin %store-monad
(set-guile-for-build (default-guile))
(lower-object (system-image image)))))
(define MiB (define MiB
(expt 2 20)) (expt 2 20))
(if (member system %guix-system-supported-systems) (if (member system %guixsd-supported-systems)
`(,(->job 'usb-image (list (->job 'usb-image
(build-image (run-with-store store
(image (mbegin %store-monad
(inherit efi-disk-image) (set-guile-for-build (default-guile))
(size (* 1500 MiB)) (lower-object
(operating-system installation-os)))) (system-image
,(->job 'iso9660-image (image
(build-image (inherit efi-disk-image)
(image (size (* 1500 MiB))
(inherit iso9660-image) (operating-system installation-os)))))))
(operating-system installation-os)))) (->job 'iso9660-image
;; Only cross-compile Guix System images from x86_64-linux for now. (run-with-store store
,@(if (string=? system "x86_64-linux") (mbegin %store-monad
(map (lambda (image) (set-guile-for-build (default-guile))
(->job (image-name image) (build-image image))) (lower-object
%guix-system-images) (system-image
'()) (image
'()))) (inherit iso9660-image)
(operating-system installation-os))))))))
'()))
(define channel-build-system (define channel-build-system
;; Build system used to "convert" a channel instance to a package. ;; Build system used to "convert" a channel instance to a package.
@ -313,7 +305,11 @@ (define (->job test)
"." system)))) "." system))))
(cons name (test->thunk test)))) (cons name (test->thunk test))))
(if (member system %guix-system-supported-systems) (if (and (member system %guixsd-supported-systems)
;; XXX: Our build farm has too few ARMv7 machines and they are very
;; slow, so skip system tests there.
(not (string=? system "armhf-linux")))
;; Override the value of 'current-guix' used by system tests. Using a ;; Override the value of 'current-guix' used by system tests. Using a
;; channel instance makes tests that rely on 'current-guix' less ;; channel instance makes tests that rely on 'current-guix' less
;; expensive. It also makes sure we get a valid Guix package when this ;; expensive. It also makes sure we get a valid Guix package when this
@ -490,7 +486,7 @@ (define source
(package->job store package (package->job store package
system)))) system))))
(append (filter-map job all) (append (filter-map job all)
(image-jobs store system) (qemu-jobs store system)
(system-test-jobs store system (system-test-jobs store system
#:source source #:source source
#:commit commit) #:commit commit)