[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: cuirass: Add job specs for the modular Guix.
From: |
Ludovic Courtès |
Subject: |
07/08: cuirass: Add job specs for the modular Guix. |
Date: |
Wed, 4 Apr 2018 16:54:59 -0400 (EDT) |
civodul pushed a commit to branch wip-pull-multiple-derivations
in repository guix.
commit d94f7b73ae46c7085e585b00858f7a305055e830
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.
* build-aux/hydra/guix-modular.scm (hydra-jobs): Define 'this-file' and
use it when ARGUMENTS lacks the 'guix key.
* Makefile.am (EXTRA_DIST): Add it.
---
Makefile.am | 1 +
build-aux/cuirass/guix-modular.scm | 6 ++++++
build-aux/hydra/guix-modular.scm | 8 +++++++-
3 files changed, 14 insertions(+), 1 deletion(-)
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..50afabe
--- /dev/null
+++ b/build-aux/cuirass/guix-modular.scm
@@ -0,0 +1,6 @@
+;;;
+;;; This file defines Cuirass build jobs to build Guix itself.
+;;;
+
+(include-from-path "build-aux/hydra/guix-modular.scm")
+(include-from-path "build-aux/cuirass/hydra-to-cuirass.scm")
diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm
index bdbb2fa..20deb7b 100644
--- a/build-aux/hydra/guix-modular.scm
+++ b/build-aux/hydra/guix-modular.scm
@@ -85,8 +85,14 @@ for SYSTEM. Use VERSION as the version identifier."
(_
(list (%current-system)))))
+ (define this-file
+ (assq-ref (current-source-location) 'filename))
+
(define guix-checkout
- (assq-ref arguments 'guix))
+ (or (assq-ref arguments 'guix) ;hydra
+ `((file-name . ,(string-append this-file ;cuirass
+ "/../.."))
+ (revision . ,(assq-ref arguments #:current-commit)))))
(define version
(or (assq-ref guix-checkout 'revision)
- branch wip-pull-multiple-derivations created (now 05433e7), Ludovic Courtès, 2018/04/04
- 02/08: modules: Report the search path in &missing-dependency-error., Ludovic Courtès, 2018/04/04
- 04/08: build: Add 'as-derivation' target., Ludovic Courtès, 2018/04/04
- 08/08: hydra: 'guix-modular' jobs use the new 'build-self'., Ludovic Courtès, 2018/04/04
- 07/08: cuirass: Add job specs for the modular Guix.,
Ludovic Courtès <=
- 06/08: cuirass: Factorize hydra-to-cuirass CI job translation., Ludovic Courtès, 2018/04/04
- 03/08: build-self: Use (guix self)., Ludovic Courtès, 2018/04/04
- 05/08: discovery: Remove dependency on (guix ui)., Ludovic Courtès, 2018/04/04
- 01/08: Add (guix self)., Ludovic Courtès, 2018/04/04