From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 06:04:36 2025 Received: (at submit) by debbugs.gnu.org; 28 Apr 2025 10:04:37 +0000 Received: from localhost ([127.0.0.1]:53999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9LLo-0005BB-Dj for submit@debbugs.gnu.org; Mon, 28 Apr 2025 06:04:36 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44876) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9LLi-00058w-2j for submit@debbugs.gnu.org; Mon, 28 Apr 2025 06:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9LLR-0001La-HR for guix-patches@gnu.org; Mon, 28 Apr 2025 06:04:13 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9LLO-0008Tv-7o for guix-patches@gnu.org; Mon, 28 Apr 2025 06:04:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=V6uOTPRHY5R8Uwt644qXsAt224EBxzovdW7a2l1gGoA=; b=DcZZ/1ttKAjsbg9nTzk3uJZVg0L831i/zUu98BgQItRZP5pwX4TS9GjZ R7FrIOiPljM3wdFQoI1G2LPmHx2zUn/bDDF938qJ1HvpJLoIE1w4Q/na3 s17OsDnhjByKSRJlbz7vleFTqbkLx0s0nNy8tDf9Tur5ED547s27faxt0 g=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=romain.garbage@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.15,246,1739833200"; d="scan'208";a="115331327" Received: from 91-160-179-8.subs.proxad.net (HELO localhost.localdomain) ([91.160.179.8]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 12:04:04 +0200 From: Romain GARBAGE To: guix-patches@gnu.org Subject: [PATCH Cuirass 0/3] Configuration of a Guix mirror. Date: Mon, 28 Apr 2025 12:03:25 +0200 Message-ID: <20250428100351.1172-1-romain.garbage@inria.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=192.134.164.104; envelope-from=romain.garbage@inria.fr; helo=mail3-relais-sop.national.inria.fr X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit Cc: ludovic.courtes@inria.fr, Romain GARBAGE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This patch series adds support for configuring a Guix mirror in forge-related specifications, that are generated automatically. Romain GARBAGE (3): parameters: Add %guix-mirror-url. forges: Add %default-forges-channels. forges: Use %default-forges-channels instead of %default-channels. src/cuirass/forges.scm | 17 ++++++++++++++++- src/cuirass/forges/forgejo.scm | 2 +- src/cuirass/forges/gitlab.scm | 2 +- src/cuirass/parameters.scm | 8 +++++++- tests/forgejo.scm | 2 +- tests/forges-notification.scm | 7 ++++--- tests/forges.scm | 11 ++++++++++- tests/gitlab.scm | 10 +++++----- 8 files changed, 45 insertions(+), 14 deletions(-) base-commit: 91549453f00466e3778a1ceb191de11f5c94ef84 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 06:09:10 2025 Received: (at 78109) by debbugs.gnu.org; 28 Apr 2025 10:09:10 +0000 Received: from localhost ([127.0.0.1]:54050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9LQE-0005pQ-0l for submit@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:10 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:28786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9LQA-0005nm-GI for 78109@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=bYChL31leTQNqpRfSxCEFaIcyg/xGRyUcjidUbEcPjo=; b=akG6rs270AjSfMQnqZA41/Cwcb16Du4Kq8lX8NDyZCK+D/SZl20EuEqw WWR17PxXAUtRgUFmf0e2y4qazphNcmEewn2Fkh4++kYom90o+lh3yMCgV XTMSxj/tph3wRF2S4TuGrsBzXKCi3OszaQTadhRvgXw/4ezWfdeec7olq Q=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=romain.garbage@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.15,246,1739833200"; d="scan'208";a="115332228" Received: from 91-160-179-8.subs.proxad.net (HELO localhost.localdomain) ([91.160.179.8]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 12:09:00 +0200 From: Romain GARBAGE To: 78109@debbugs.gnu.org Subject: [PATCH Cuirass 1/3] parameters: Add %guix-mirror-url. Date: Mon, 28 Apr 2025 12:08:46 +0200 Message-ID: <20250428100848.14385-1-romain.garbage@inria.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78109 Cc: ludovic.courtes@inria.fr, Romain GARBAGE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * src/cuirass/parameters.scm (%guix-mirror-url): New variable. --- src/cuirass/parameters.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cuirass/parameters.scm b/src/cuirass/parameters.scm index 2f28dcc..4edfc19 100644 --- a/src/cuirass/parameters.scm +++ b/src/cuirass/parameters.scm @@ -32,7 +32,9 @@ %mastodon-instance-url %mastodon-instance-token - %forgejo-notification-type)) + %forgejo-notification-type + + %guix-mirror-url)) ;; This variable is looked up by 'mu-message-send'. (define-public mu-debug 0) @@ -78,3 +80,7 @@ ;; The type of notification to send to a Forgejo server. (define %forgejo-notification-type (make-parameter 'create-review)) + +;; The URL of a Guix mirror. +(define %guix-mirror-url + (make-parameter #f)) base-commit: 91549453f00466e3778a1ceb191de11f5c94ef84 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 06:09:15 2025 Received: (at 78109) by debbugs.gnu.org; 28 Apr 2025 10:09:15 +0000 Received: from localhost ([127.0.0.1]:54053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9LQI-0005q1-Qj for submit@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:15 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:28786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9LQC-0005nm-AH for 78109@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bPCustLs0jSzPegR7BaO7WxTL6tqPLjK1JuuVN7eUbY=; b=IqGmJbYfiuePEj+k50U5i+UjncypPLEZFB2FnLvjgmwt5ZTwi6vyiJFY q+OF3iLyAkslXJ3+PcF/H4Tsq4FLDMMjK5Auko82YAyK2RtU1yEPihz7K /64SPzQwRO2skT4cLX3i9LcBubS4NJVBRHJEgaaliOdUf6pRm+ISMNCsn w=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=romain.garbage@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.15,246,1739833200"; d="scan'208";a="115332230" Received: from 91-160-179-8.subs.proxad.net (HELO localhost.localdomain) ([91.160.179.8]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 12:09:01 +0200 From: Romain GARBAGE To: 78109@debbugs.gnu.org Subject: [PATCH Cuirass 2/3] forges: Add %default-forges-channels. Date: Mon, 28 Apr 2025 12:08:47 +0200 Message-ID: <20250428100848.14385-2-romain.garbage@inria.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250428100848.14385-1-romain.garbage@inria.fr> References: <20250428100848.14385-1-romain.garbage@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78109 Cc: ludovic.courtes@inria.fr, Romain GARBAGE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * src/cuirass/forges.scm (%default-forges-channels): New variable. * tests/forges.scm: Add test for %default-forges-channels. --- src/cuirass/forges.scm | 17 ++++++++++++++++- tests/forges.scm | 11 ++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/cuirass/forges.scm b/src/cuirass/forges.scm index aeebbec..c5741d5 100644 --- a/src/cuirass/forges.scm +++ b/src/cuirass/forges.scm @@ -18,7 +18,9 @@ (define-module (cuirass forges) #:use-module ((guix utils) #:select (%current-system)) + #:use-module (guix channels) #:use-module (cuirass config) + #:use-module (cuirass parameters) #:use-module (cuirass specification) #:use-module (cuirass logging) #:use-module (json) @@ -38,7 +40,9 @@ jobset-options-systems forge-get-token - %forge-token-directory)) + %forge-token-directory + + %default-forges-channels)) ;;; Commentary: ;;; @@ -143,3 +147,14 @@ both strings. As an exemple, a token for a Git repository located at (if (unspecified? v) #f (vector->list v))))) + +;; This expands %DEFAULT-CHANNELS to take into account mirror setting. +(define (%default-forges-channels) + (map (lambda (c) + (if (and (%guix-mirror-url) + (eq? (channel-name c) 'guix)) + (channel + (inherit c) + (url (%guix-mirror-url))) + c)) + %default-channels)) diff --git a/tests/forges.scm b/tests/forges.scm index 86556da..258addc 100644 --- a/tests/forges.scm +++ b/tests/forges.scm @@ -16,7 +16,10 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with Cuirass. If not, see ) id 1u9LQJ-0005q9-JQ for submit@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:16 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:28786) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9LQD-0005nm-Td for 78109@debbugs.gnu.org; Mon, 28 Apr 2025 06:09:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r7aD9GlyiI5omm5lcwv50RfZbrODIocXBYU5RG8rv6k=; b=C86zfvkhQV6OdWKV/EWkK630sUeuS0hTGriTGI6LtNulbQsJ7QO4/PXs 9QBC64QUoZb9Sx3UEYUHDzHXi8PQFIOHn70BlFrgRjHeonitgJ1L4iFRb wXafhQqhJRDOj7j3gAmdmaZ9Z23i7nR49+TX59dZuridEvrFUKIL2LURI 0=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=romain.garbage@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.15,246,1739833200"; d="scan'208";a="115332232" Received: from 91-160-179-8.subs.proxad.net (HELO localhost.localdomain) ([91.160.179.8]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2025 12:09:01 +0200 From: Romain GARBAGE To: 78109@debbugs.gnu.org Subject: [PATCH Cuirass 3/3] forges: Use %default-forges-channels instead of %default-channels. Date: Mon, 28 Apr 2025 12:08:48 +0200 Message-ID: <20250428100848.14385-3-romain.garbage@inria.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250428100848.14385-1-romain.garbage@inria.fr> References: <20250428100848.14385-1-romain.garbage@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78109 Cc: ludovic.courtes@inria.fr, Romain GARBAGE X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * src/cuirass/forges/forgejo.scm (forgejo-pull-request->specification), src/cuirass/forges/gitlab.scm (gitlab-merge-request->specification): Use %default-forges-channels instead of %default-channels. * tests/forgejo.scm, tests/forges-notification.scm, tests/gitlab.scm : Update tests. --- src/cuirass/forges/forgejo.scm | 2 +- src/cuirass/forges/gitlab.scm | 2 +- tests/forgejo.scm | 2 +- tests/forges-notification.scm | 7 ++++--- tests/gitlab.scm | 10 +++++----- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/cuirass/forges/forgejo.scm b/src/cuirass/forges/forgejo.scm index 42fa3f3..bbda806 100644 --- a/src/cuirass/forges/forgejo.scm +++ b/src/cuirass/forges/forgejo.scm @@ -168,7 +168,7 @@ (name project-name) (url source-url) (branch source-branch)) - %default-channels)) + (%default-forges-channels))) (priority priority) (period period) (systems systems) diff --git a/src/cuirass/forges/gitlab.scm b/src/cuirass/forges/gitlab.scm index ced8907..922ace0 100644 --- a/src/cuirass/forges/gitlab.scm +++ b/src/cuirass/forges/gitlab.scm @@ -139,7 +139,7 @@ (name project-name) (url source-url) (branch source-branch)) - %default-channels)) + (%default-forges-channels))) (priority priority) (period period) (systems systems) diff --git a/tests/forgejo.scm b/tests/forgejo.scm index 6b3e0dd..22d4f70 100644 --- a/tests/forgejo.scm +++ b/tests/forgejo.scm @@ -88,7 +88,7 @@ (name 'project-name) (url "https://forgejo.instance.test/source-repo/fork-name.git") (branch "test-branch")) - %default-channels)) + (%default-forges-channels))) (priority %default-jobset-options-priority) (period %default-jobset-options-period) (systems %default-jobset-options-systems) diff --git a/tests/forges-notification.scm b/tests/forges-notification.scm index fff10ee..fa673f4 100644 --- a/tests/forges-notification.scm +++ b/tests/forges-notification.scm @@ -17,6 +17,7 @@ ;;; along with Cuirass. If not, see ) id 1uDJSo-0006HH-Hh for submit@debbugs.gnu.org; Fri, 09 May 2025 04:52:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48732) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDJSl-0006H1-GR for 78109@debbugs.gnu.org; Fri, 09 May 2025 04:52:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDJSg-0006w6-27; Fri, 09 May 2025 04:52:06 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Romain GARBAGE Subject: Re: [PATCH Cuirass 1/3] parameters: Add %guix-mirror-url. In-Reply-To: <20250428100848.14385-1-romain.garbage@inria.fr> (Romain GARBAGE's message of "Mon, 28 Apr 2025 12:08:46 +0200") References: <20250428100848.14385-1-romain.garbage@inria.fr> User-Agent: mu4e 1.12.9; emacs 29.4 X-URL: https://people.bordeaux.inria.fr/lcourtes/ X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu X-Revolutionary-Date: =?utf-8?Q?D=C3=A9cadi?= 20 =?utf-8?Q?Flor=C3=A9al?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Sarcloir Date: Fri, 09 May 2025 10:36:46 +0200 Message-ID: <87h61unpsx.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78109 Cc: 78109@debbugs.gnu.org, ludovic.courtes@inria.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) =C3=80 discuter, mais je suis plut=C3=B4t d'avis de laisser tomber =C3=A7a. T'en dis quoi=C2=A0? Ludo'.