[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: 01/01: Merge branch 'staging'
From: |
Ludovic Courtès |
Subject: |
Re: 01/01: Merge branch 'staging' |
Date: |
Wed, 13 Feb 2019 23:39:49 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hi Mark,
Mark H Weaver <address@hidden> skribis:
> address@hidden writes:
>
>> civodul pushed a commit to branch master
>> in repository guix.
>>
>> commit 50a93adc05b611836e740c4b55571890f4c6770a
>> Merge: 722ac64 69fb26d
>> Author: Ludovic Courtès <address@hidden>
>> Date: Sat Feb 9 15:14:59 2019 +0100
>>
>> Merge branch 'staging'
>
> I asked Hydra to evaluate 'master' after this commit, and it failed.
> See below for the evaluator.log output.
[...]
> evaluator hydra-eval-guile-jobs
> hydra-eval-guile-jobs returned exit code 1:
> adding `/gnu/store/1mkv0pa3yfgb8zvyc8lv3rgbppa313xw-git-export' to the load
> path
> WARNING: (gnu packages emacs-xyz): `python-sphinx' imported from both (gnu
> packages python) and (gnu packages python-xyz)
> WARNING: (gnu packages emacs-xyz): `python-autopep8' imported from both (gnu
> packages python) and (gnu packages python-xyz)
[...]
> Throw to key `srfi-34' with args `(#<condition &message [message:
> "ghostscript-CVE-2018-16509.patch: patch not found"] 42fd960>)'.
The problem is that ‘hydra-eval-guile-jobs’ would systematically add its
inputs to ‘%load-path’. Chaos ensues, because we end up loading a
mixture of modules from the checkout and modules from the installed Guix
(that’s why we used to force auto-compilation, before commit
b5f8c2c88543158e8aca76aa98f9009f6b9e743a.)
To address this, I locally modified ‘hydra-eval-guile-jobs’ along these
lines:
diff --git a/src/script/hydra-eval-guile-jobs.in
b/src/script/hydra-eval-guile-jobs.in
index 8c5df125..788f0786 100644
--- a/src/script/hydra-eval-guile-jobs.in
+++ b/src/script/hydra-eval-guile-jobs.in
@@ -192,9 +192,7 @@ directory or #f."
((_ dir) dir)
((dir) dir)))
(dir* (module-directory dir)))
- (format (current-error-port) "adding `~a' to the load path~%" dir*)
- (set! %load-path (cons dir* %load-path))
- (set! %load-compiled-path (cons dir* %load-compiled-path)))
+ (format (current-error-port) "NOT adding `~a' to the load path~%"
dir*))
(loop rest result file entry roots-dir))
(("--argstr" name value rest ...)
(loop rest (alist-cons (string->symbol name) value result)
That solved the issue:
https://hydra.gnu.org/jobset/gnu/master
However, relying on this customized variant of an old Hydra isn’t really
viable IMO. We should consider switching hydra.gnu.org to a config
similar to that of berlin and bayfront.
Thanks,
Ludo’.