GNU bug report logs - #28487
[PATCH] cuirass: Add gnu-system build spec.

Previous Next

Full log

Message #17 received at 28487 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jan Nieuwenhuizen <janneke <at> gnu.org>
Cc: Mathieu Othacehe <m.othacehe <at> gmail.com>, 28487 <at> debbugs.gnu.org
Subject: Re: [bug#28487] [PATCH] cuirass: Add gnu-system build spec.
Date: Tue, 26 Sep 2017 22:29:15 +0200

Jan Nieuwenhuizen <janneke <at> gnu.org> skribis:

> Ludovic Courtès writes:
>
>> I like this but… while we’re at it, could we arrange to have a single
>> file that works for both Hydra and Cuirass?
>
> I like that.  It bothered me a bit to have similar files (not DRY) but
> didn't see how that could be easily avoided.
>
>> The main difference is that one returns an alist with symbols, whereas
>> the other returns an alist with keywords.
>
> That helps a lot...I kind of vaguely knew this but not well enough to see it!
>
>> If we could instead add, say, build-aux/hydra/gnu-system-cuirass.scm,
>> which simply loads gnu-system.scm and “converts” the resulting alist
>> appropriately, that would be awesome.
>
> I opted for build-aux/cuiras/gnu-cuirass.scm.

Sounds good!

> Attached is a new proposal, untested.  I will test it tomorrow, please
> shoot on things that are already visibly foo.
>
> One question: Assuming we intend to move to Cuirass and away from Hydra,
> do we want to reverse the translation: have Cuirass be the untranslated
> version and keep the translation to Hydra alive for as long as we need
> to support Hydra?
>
> Greetings,
> janneke
>
> From 8f10a707b0bbf6949388d85de175ed98974a8df4 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke <at> gnu.org>
> Date: Sat, 16 Sep 2017 12:57:37 +0200
> Subject: [PATCH] cuirass: Add gnu-system build spec.
>
> * build-aux/hydra/gnu-system.scm (hydra-jobs): Add subsets "hello"
> and list of packages: ("name[@version" ...).
> * build-aux/cuirass/gnu-system.scm: New file.
> * doc/guix.texi (Continuous Integration): Update example spec.
> ---
>  build-aux/cuirass/gnu-system.scm | 36 ++++++++++++++++++++++++++++++++++++
>  build-aux/hydra/gnu-system.scm   | 18 ++++++++++++++++++
>  doc/guix.texi                    |  4 ++--
>  3 files changed, 56 insertions(+), 2 deletions(-)
>  create mode 100644 build-aux/cuirass/gnu-system.scm
>
> diff --git a/build-aux/cuirass/gnu-system.scm b/build-aux/cuirass/gnu-system.scm
> new file mode 100644
> index 000000000..b545323f6
> --- /dev/null
> +++ b/build-aux/cuirass/gnu-system.scm
> @@ -0,0 +1,36 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2017 Jan Nieuwenhuizen <janneke <at> gnu.org>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
> +
> +;;;
> +;;; This file defines build jobs for the Cuirass continuation integration
> +;;; tool.
> +;;;
> +
> +(include-from-path "build-aux/hydra/gnu-system.scm")
> +
> +(define (cuirass-jobs store arguments)
> +  "Return Cuirass jobs."
> +  (pk (map hydra-job->cuirass-job (hydra-jobs store arguments))))
> +
> +(define (hydra-job->cuirass-job hydra-job)
> +  (let ((name (car hydra-job))
> +        (job ((cdr hydra-job))))
> +    (cons name (lambda _ (map symbol-alist-entry->keyword-alist-entry job)))))
> +
> +(define (symbol-alist-entry->keyword-alist-entry entry)
> +  (cons (symbol->keyword (car entry)) (cdr entry)))

I *think* that’s correct, though we’ll need to double check.

> --- a/build-aux/hydra/gnu-system.scm
> +++ b/build-aux/hydra/gnu-system.scm
> @@ -270,6 +270,8 @@ valid."
>    (define subset
>      (match (assoc-ref arguments 'subset)
>        ("core" 'core)                              ; only build core packages
> +      ("hello" 'hello)                            ; only build hello
> +      (((? string?) (? string?) ...) 'list)       ; only build selected list of packages
>        (_ 'all)))                                  ; build everything

This part could be added separately.

(It’s not usuable via Hydra since its UIs does not support passing
list-of-strings arguments.)

Thanks a lot!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.