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: Tue, 26 Sep 2017 19:56:32 +0200 [thread overview]
Message-ID: <87mv5hqr73.fsf@gnu.org> (raw)
In-Reply-To: <87zi9h27q3.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 26 Sep 2017 10:18:44 +0200")
[-- Attachment #1: Type: text/plain, Size: 1208 bytes --]
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.
> I understand this is not quite what you were asking for ;-), but it
> would achieve the same result.
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
[-- Attachment #2: 0001-cuirass-Add-gnu-system-build-spec.patch --]
[-- Type: text/x-patch, Size: 5034 bytes --]
From 8f10a707b0bbf6949388d85de175ed98974a8df4 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" ...).
* 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@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)))
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 73bd566f7..9968fc3da 100644
--- 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
(define (cross-jobs system)
@@ -340,6 +342,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
--
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: 154 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-26 17:58 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 [this message]
2017-09-26 18:05 ` Jan Nieuwenhuizen
2017-09-26 20:29 ` Ludovic Courtès
2017-09-27 18:55 ` Jan Nieuwenhuizen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mv5hqr73.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.