From: Jan Nieuwenhuizen <janneke@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 28487@debbugs.gnu.org
Subject: [bug#28487] [PATCH] cuirass: Add gnu-system build spec.
Date: Wed, 27 Sep 2017 20:55:23 +0200 [thread overview]
Message-ID: <87a81gq8dg.fsf@gnu.org> (raw)
In-Reply-To: <87a81hgq5g.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 26 Sep 2017 22:29:15 +0200")
[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]
Ludovic Courtès writes:
Hey Ludo',
>> I opted for build-aux/cuiras/gnu-cuirass.scm.
>
> Sounds good!
Ok, grand.
>> +(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.
I tested today and there were minor problems. Cuirass actually doesn't
take an alist; instead takes a list that includes (#:job-name . "name").
Also, Cuirass performs an sexp-read and thus #<<license> ...> needs to
get sexp'ified.
Anyway, what I proposed was close and attached is a tested, working
version (that may need some work, see below).
>> --- 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.
Yes...it could. Do you mean a separate patch, or ...
> (It’s not usuable via Hydra since its UIs does not support passing
> list-of-strings arguments.)
...I don't quite understand what you propose here. I appreciate that
I'm adding functionality for Cuirass to the hydra file where in itself
that does not make much sense...
Otoh, I don't see how to move this functionality to
cuirass/gnu-system.scm only without duplicating much of `hydra-jobs'; so
that's probably not what you mean... / somewhat confused here. ;-)
I'd be happy to update or split this patch if once I understand what you
want or feel free to do it for me if that's easier for you.
Thanks!
janneke
[-- Attachment #2: 0001-cuirass-Add-gnu-system-build-spec.patch --]
[-- Type: text/x-patch, Size: 6134 bytes --]
From bb82d85df2380cd0c25de0f659a7010f2d88ee4f Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@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" ...).
* guix/licenses.scm: Export <license>.
* build-aux/cuirass/gnu-system.scm: New file.
* doc/guix.texi (Continuous Integration): Update example spec.
---
build-aux/cuirass/gnu-system.scm | 45 ++++++++++++++++++++++++++++++++++++++++
build-aux/hydra/gnu-system.scm | 19 +++++++++++++++++
doc/guix.texi | 4 ++--
guix/licenses.scm | 3 ++-
4 files changed, 68 insertions(+), 3 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..0028d9d8e
--- /dev/null
+++ b/build-aux/cuirass/gnu-system.scm
@@ -0,0 +1,45 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@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")
+
+(use-modules ((guix licenses) #:select (<license>)))
+
+(define (cuirass-jobs store arguments)
+ "Return Cuirass jobs."
+ (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))))
+ (lambda _ (acons #:job-name (symbol->string name)
+ (map symbol-alist-entry->keyword-alist-entry job)))))
+
+(define (symbol-alist-entry->keyword-alist-entry entry)
+ (cons (symbol->keyword (car entry)) (entry->sexp-entry (cdr entry))))
+
+(define (entry->sexp-entry o)
+ (match o
+ (($ <license> name uri comment)
+ `((name . ,name) (uri . ,uri) (comment . ,comment)))
+ (_ o)))
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 73bd566f7..146d929f9 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -270,6 +271,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
(define (cross-jobs system)
@@ -340,6 +343,22 @@ valid."
package system))
%core-packages)
(cross-jobs system)))
+ ((hello)
+ ;; Build hello package only.
+ (if (string=? system (%current-system))
+ (let ((hello (specification->package "hello")))
+ (list (package-job store (job-name hello) hello system)))
+ '()))
+ ((list)
+ ;; Build selected list of packages only.
+ (if (string=? system (%current-system))
+ (let* ((names (assoc-ref arguments 'subset))
+ (packages (map specification->package names)))
+ (map (lambda (package)
+ (package-job store (job-name package)
+ package system))
+ packages))
+ '()))
(else
(error "unknown subset" subset))))
%hydra-supported-systems)))
diff --git a/doc/guix.texi b/doc/guix.texi
index fff3fbd5f..c1391ee4b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -15375,8 +15375,8 @@ packages, as prescribed in the @file{gnu-system.scm} example spec:
cuirass
"/tests/gnu-system.scm"))
- (#:proc . hydra-jobs)
- (#:arguments (subset . "hello"))
+ (#:proc . cuirass-jobs)
+ (#:arguments (subset . ("hello" "grep")))
(#:branch . "master"))))
(service cuirass-service-type
(cuirass-configuration
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 6de611da2..144dd06f0 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -31,7 +31,8 @@
(define-module (guix licenses)
#:use-module (srfi srfi-9)
- #:export (license? license-name license-uri license-comment
+ #:export (<license>
+ license? license-name license-uri license-comment
agpl1 agpl3 agpl3+
asl1.1 asl2.0
boost1.0
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
[-- Attachment #3: Type: text/plain, Size: 152 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
next prev parent reply other threads:[~2017-09-27 18:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-17 20:11 [bug#28484] Some steps and questions for Cuirass Jan Nieuwenhuizen
2017-09-17 20:11 ` [bug#28485] [PATCH 1/3] base: Make working copy writable Jan Nieuwenhuizen
[not found] ` <handler.28485.B.1505679193775.ack@debbugs.gnu.org>
2017-09-18 15:46 ` bug#28485: Acknowledgement ([PATCH 1/3] base: Make working copy writable.) Jan Nieuwenhuizen
2017-09-17 20:11 ` [bug#28486] [PATCH 2/3] gnu-system: Accept subset with list of package names Jan Nieuwenhuizen
[not found] ` <handler.28486.B.1505679194784.ack@debbugs.gnu.org>
2017-09-18 15:45 ` bug#28486: Acknowledgement ([PATCH 2/3] gnu-system: Accept subset with list of package names.) Jan Nieuwenhuizen
2017-09-17 20:11 ` [bug#28488] [PATCH 3/3] base: Show feedback when build has finished Jan Nieuwenhuizen
[not found] ` <handler.28488.B.1505679198802.ack@debbugs.gnu.org>
2017-09-18 15:48 ` bug#28488: Acknowledgement ([PATCH 3/3] base: Show feedback when build has finished.) Jan Nieuwenhuizen
2017-09-17 20:11 ` [bug#28487] [PATCH] cuirass: Add gnu-system build spec Jan Nieuwenhuizen
2017-09-26 8:18 ` Ludovic Courtès
2017-09-26 17:56 ` Jan Nieuwenhuizen
2017-09-26 18:05 ` Jan Nieuwenhuizen
2017-09-26 20:29 ` Ludovic Courtès
2017-09-27 18:55 ` Jan Nieuwenhuizen [this message]
2017-09-27 19:45 ` Ludovic Courtès
2017-09-27 20:32 ` Jan Nieuwenhuizen
2017-09-27 20:52 ` Jan Nieuwenhuizen
2017-09-28 8:26 ` Ludovic Courtès
2017-09-28 15:41 ` bug#28487: " Jan Nieuwenhuizen
2017-09-28 8:27 ` [bug#28487] " Ludovic Courtès
2017-09-28 16:04 ` Jan Nieuwenhuizen
2017-09-18 11:51 ` [bug#28484] Some steps and questions for Cuirass Mathieu Othacehe
2017-09-18 15:44 ` bug#28484: " Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a81gq8dg.fsf@gnu.org \
--to=janneke@gnu.org \
--cc=28487@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).