From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTZ5D-0005gI-RQ for guix-patches@gnu.org; Thu, 14 Jun 2018 16:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTZ5C-0000mX-QH for guix-patches@gnu.org; Thu, 14 Jun 2018 16:43:03 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTZ5C-0000mR-M7 for guix-patches@gnu.org; Thu, 14 Jun 2018 16:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fTZ5C-0003TR-Ai for guix-patches@gnu.org; Thu, 14 Jun 2018 16:43:02 -0400 Subject: [bug#31813] [PATCH] evaluate: Use a generic key to identify Cuirass arguments. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180613135001.28724-1-clement@lassieur.org> Date: Thu, 14 Jun 2018 22:42:09 +0200 In-Reply-To: <20180613135001.28724-1-clement@lassieur.org> ("=?UTF-8?Q?Cl=C3=A9ment?= Lassieur"'s message of "Wed, 13 Jun 2018 15:50:01 +0200") Message-ID: <87po0txfq6.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 31813@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Heya! Cl=C3=A9ment Lassieur 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 =C2=A9 2016, 2018 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2016, 2017 Mathieu Lirzin > -;;; Copyright =C2=A9 2017 Mathieu Othacehe > +;;; Copyright =C2=A9 2017, 2018 Mathieu Othacehe > +;;; Copyright =C2=A9 2018 Cl=C3=A9ment Lassieur > ;;; > ;;; 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 =E2=80=98guix=E2=80=99. Shouldn=E2=80=99t we instead change the schema along these lines? --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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 ( --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ? That way we can have one =E2=80=98guix-modular=E2=80=99 job for each branch= , for example. Mathieu Othacehe 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=3Durl1 or guix pull --url=3Durl2 Neat! So you have a Cuirass setup that works well for you? I=E2=80=99m as= king because I=E2=80=99m not fully satisfied with what we have on berlin, but pa= rt 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=E2=80=99. --=-=-=--