aboutsummaryrefslogtreecommitdiff
path: root/build-aux/hydra/evaluate.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludovic.courtes@inria.fr>2018-03-29 17:30:12 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-08 17:48:33 +0200
commit9fe95946118e9530504699360b1ca3507fa0360d (patch)
tree668b8cb131f1736428c42b84f941bfc27d6241eb /build-aux/hydra/evaluate.scm
parent351f384e57939005b25fa976952e3a0e08785893 (diff)
downloadguix-9fe95946118e9530504699360b1ca3507fa0360d.tar
guix-9fe95946118e9530504699360b1ca3507fa0360d.tar.gz
hydra: 'guix-modular' jobs use the new 'build-self'.
* build-aux/hydra/guix-modular.scm: Remove 'eval-when' form that fiddled with '%load-path'. (build-job): Load 'build-aux/build-self.scm' and call the procedure it returns. * build-aux/hydra/evaluate.scm: The 'build-things' replacement no longer calls 'exit'.
Diffstat (limited to 'build-aux/hydra/evaluate.scm')
-rw-r--r--build-aux/hydra/evaluate.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm
index 8e391f44fd..5793c022ff 100644
--- a/build-aux/hydra/evaluate.scm
+++ b/build-aux/hydra/evaluate.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
@@ -79,7 +79,8 @@ Otherwise return THING."
(match (command-line)
((command file cuirass? ...)
;; Load FILE, a Scheme file that defines Hydra jobs.
- (let ((port (current-output-port)))
+ (let ((port (current-output-port))
+ (real-build-things build-things))
(save-module-excursion
(lambda ()
(set-current-module %user-module)
@@ -93,13 +94,15 @@ Otherwise return THING."
;; Grafts can trigger early builds. We do not want that to happen
;; during evaluation, so use a sledgehammer to catch such problems.
+ ;; An exception, though, is the evaluation of Guix itself, which
+ ;; requires building a "trampoline" program.
(set! build-things
(lambda (store . args)
(format (current-error-port)
- "error: trying to build things during evaluation!~%")
+ "warning: building things during evaluation~%")
(format (current-error-port)
"'build-things' arguments: ~s~%" args)
- (exit 1)))
+ (apply real-build-things store args)))
;; Call the entry point of FILE and print the resulting job sexp.
(pretty-print