From: ludo@gnu.org (Ludovic Courtès)
To: "Clément Lassieur" <clement@lassieur.org>
Cc: 31813@debbugs.gnu.org
Subject: [bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments.
Date: Thu, 14 Jun 2018 22:42:09 +0200 [thread overview]
Message-ID: <87po0txfq6.fsf@gnu.org> (raw)
In-Reply-To: <20180613135001.28724-1-clement@lassieur.org> ("Clément Lassieur"'s message of "Wed, 13 Jun 2018 15:50:01 +0200")
[-- Attachment #1: Type: text/plain, Size: 1664 bytes --]
Heya!
Clément Lassieur <clement@lassieur.org> skribis:
> So that Cuirass specifications used to build 'guix-modular' can be named
> differently than "guix" and "guix-modular" (see Guix's
> build-aux/hydra/guix-modular.scm).
>
> The name is used as a primary key, so before that commit, it was also
> impossible to have several such specifications.
[...]
> diff --git a/bin/evaluate.in b/bin/evaluate.in
> index d973c44..86d0e83 100644
> --- a/bin/evaluate.in
> +++ b/bin/evaluate.in
> @@ -6,7 +6,8 @@ exec ${GUILE:-@GUILE@} --no-auto-compile -e main -s "$0" "$@"
> ;;;; evaluate -- convert a specification to a job list
> ;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
> ;;; Copyright © 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
> -;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
> +;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com>
> +;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
> ;;;
> ;;; This file is part of Cuirass.
> ;;;
> @@ -98,7 +99,7 @@ building things during evaluation~%")
> (proc (module-ref %user-module proc-name))
> (commit (assq-ref spec #:current-commit))
> (name (assq-ref spec #:name))
> - (args `((,(string->symbol name)
> + (args `((guix
> (revision . ,commit)
> (file-name . ,source))
> ,@(or (assq-ref spec #:arguments) '())))
If we do that, then everything is called ‘guix’.
Shouldn’t we instead change the schema along these lines?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 590 bytes --]
diff --git a/src/schema.sql b/src/schema.sql
index 65aebbd..bad2f6d 100644
--- a/src/schema.sql
+++ b/src/schema.sql
@@ -1,7 +1,7 @@
BEGIN TRANSACTION;
CREATE TABLE Specifications (
- repo_name TEXT NOT NULL PRIMARY KEY,
+ repo_name TEXT NOT NULL,
url TEXT NOT NULL,
load_path TEXT NOT NULL,
file TEXT NOT NULL,
@@ -11,7 +11,8 @@ CREATE TABLE Specifications (
branch TEXT,
tag TEXT,
revision TEXT,
- no_compile_p INTEGER
+ no_compile_p INTEGER,
+ PRIMARY KEY (repo_name, branch)
);
CREATE TABLE Stamps (
[-- Attachment #3: Type: text/plain, Size: 678 bytes --]
?
That way we can have one ‘guix-modular’ job for each branch, for example.
Mathieu Othacehe <m.othacehe@gmail.com> skribis:
> Thanks to this patch, we are able to build on Cuirass guix package from
> multiple source repositories (guix-modular-url1, guix-modular-url2, ...)
>
> and then guix pull --url=url1 or guix pull --url=url2
Neat! So you have a Cuirass setup that works well for you? I’m asking
because I’m not fully satisfied with what we have on berlin, but part of
the issues come from offloading to 20+ machines.
> Cuirass + new "guix pull" is becoming awesome, can't wait to have a
> nice web interface :)
Same here!
Ludo’.
next prev parent reply other threads:[~2018-06-14 20:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-13 13:50 [bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments Clément Lassieur
2018-06-13 13:58 ` Mathieu Othacehe
2018-06-14 20:42 ` Ludovic Courtès [this message]
2018-06-14 23:03 ` Clément Lassieur
2018-06-15 9:23 ` Ludovic Courtès
2018-06-15 13:40 ` Clément Lassieur
2018-06-16 8:45 ` Ludovic Courtès
2018-06-18 16:16 ` bug#31813: " Clément Lassieur
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=87po0txfq6.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=31813@debbugs.gnu.org \
--cc=clement@lassieur.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.