[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: cuirass: Add job specs for the modular Guix.
From: |
Ludovic Courtès |
Subject: |
11/13: cuirass: Add job specs for the modular Guix. |
Date: |
Sun, 8 Apr 2018 12:04:16 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 351f384e57939005b25fa976952e3a0e08785893
Author: Ludovic Courtès <address@hidden>
Date: Tue Mar 27 09:48:16 2018 +0200
cuirass: Add job specs for the modular Guix.
* build-aux/cuirass/guix-modular.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
---
Makefile.am | 1 +
build-aux/cuirass/guix-modular.scm | 6 ++++++
build-aux/hydra/guix-modular.scm | 7 ++++---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e630797..517322b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -469,6 +469,7 @@ EXTRA_DIST =
\
build-aux/hydra/guix.scm \
build-aux/hydra/guix-modular.scm \
build-aux/cuirass/gnu-system.scm \
+ build-aux/cuirass/guix-modular.scm \
build-aux/cuirass/hydra-to-cuirass.scm \
build-aux/check-available-binaries.scm \
build-aux/check-final-inputs-self-contained.scm \
diff --git a/build-aux/cuirass/guix-modular.scm
b/build-aux/cuirass/guix-modular.scm
new file mode 100644
index 0000000..cbbdbf1
--- /dev/null
+++ b/build-aux/cuirass/guix-modular.scm
@@ -0,0 +1,6 @@
+;;;
+;;; This file defines Cuirass build jobs to build Guix itself.
+;;;
+
+(include "../hydra/guix-modular.scm")
+(include "hydra-to-cuirass.scm")
diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm
index bdbb2fa..b6ba704 100644
--- a/build-aux/hydra/guix-modular.scm
+++ b/build-aux/hydra/guix-modular.scm
@@ -86,15 +86,16 @@ for SYSTEM. Use VERSION as the version identifier."
(list (%current-system)))))
(define guix-checkout
- (assq-ref arguments 'guix))
+ (or (assq-ref arguments 'guix) ;Hydra on hydra
+ (assq-ref arguments 'guix-modular))) ;Cuirass on berlin
(define version
(or (assq-ref guix-checkout 'revision)
"0.unknown"))
(let ((file (assq-ref guix-checkout 'file-name)))
- (format (current-error-port) "using checkout ~s (~s)~%"
- guix-checkout file)
+ (format (current-error-port) "using checkout ~s (~s; arguments: ~s)~%"
+ guix-checkout file arguments)
(map (lambda (system)
(let ((name (string->symbol
- branch master updated (8f3448f -> f6dfb8b), Ludovic Courtès, 2018/04/08
- 11/13: cuirass: Add job specs for the modular Guix.,
Ludovic Courtès <=
- 04/13: gexp: 'directory-union' has a #:resolve-collision parameter., Ludovic Courtès, 2018/04/08
- 13/13: hydra: Clear '%load-compiled-path' for gnu-system.scm., Ludovic Courtès, 2018/04/08
- 02/13: modules: Report the search path in &missing-dependency-error., Ludovic Courtès, 2018/04/08
- 07/13: build-self: Use (guix self)., Ludovic Courtès, 2018/04/08
- 10/13: cuirass: Factorize hydra-to-cuirass CI job translation., Ludovic Courtès, 2018/04/08
- 08/13: build: Add 'as-derivation' target., Ludovic Courtès, 2018/04/08
- 06/13: Add (guix self)., Ludovic Courtès, 2018/04/08
- 03/13: union: Allow callers to choose the collision resolution policy., Ludovic Courtès, 2018/04/08
- 09/13: discovery: Remove dependency on (guix ui)., Ludovic Courtès, 2018/04/08
- 01/13: tests: Skip 'pivot-root' test on Ubuntu's 4.4 kernels., Ludovic Courtès, 2018/04/08