From patchwork Tue Oct 17 11:58:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54931 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9606527BBEA; Tue, 17 Oct 2023 13:00:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC71127BBE9 for ; Tue, 17 Oct 2023 13:00:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsijg-00042Z-VD; Tue, 17 Oct 2023 07:59:44 -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 1qsija-000426-Kr for guix-patches@gnu.org; Tue, 17 Oct 2023 07:59:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qsija-0006j3-Ao; Tue, 17 Oct 2023 07:59:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qsijy-0003BV-92; Tue, 17 Oct 2023 08:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66491] [PATCH v2] hydra: build-package-metadata: Add boolean for Git submodules in sources.json. References: <20231012123931.390137-1-zimon.toutoune@gmail.com> In-Reply-To: <20231012123931.390137-1-zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 17 Oct 2023 12:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66491 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66491@debbugs.gnu.org Cc: Simon Tournier , ludo@gnu.org X-Debbugs-Original-Xcc: ludo@gnu.org Received: via spool by 66491-submit@debbugs.gnu.org id=B66491.169754395012141 (code B ref 66491); Tue, 17 Oct 2023 12:00:02 +0000 Received: (at 66491) by debbugs.gnu.org; 17 Oct 2023 11:59:10 +0000 Received: from localhost ([127.0.0.1]:58766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsij7-00039k-PX for submit@debbugs.gnu.org; Tue, 17 Oct 2023 07:59:10 -0400 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]:38932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsij2-00039B-F5 for 66491@debbugs.gnu.org; Tue, 17 Oct 2023 07:59:08 -0400 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2c508e76eb4so6770311fa.0 for <66491@debbugs.gnu.org>; Tue, 17 Oct 2023 04:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697543913; x=1698148713; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+5nIxvd66FfVpNY2T3qshL/IVW+rqdZ6ZoiBSXZ73PY=; b=bAPxyc5Je6S581bz0Zg9Weo7x3J5EXypljfEKbJc9egYoBz7BIwu8FK9x5GieU+i6k tnXz6TcQdbeMoO5Shaq6VOMSw++sLMHDrZsdCngkuLx5IP3sHOs2UtWgi1GRfnk5zELU deraLGO+W6v+NxzPRVf5BkhL6/QkOLjhpAtMfxYCoDlr5aL6bzxp4TgUIQv45vK+EFhq hKbiI4nlHiKejpMNTEIbkcfQ8yUDXAufd/vAbeH+cjSHsBkmMrr5MiUoFlDOxlBaO616 uBotnsAISWGVVpAQaD+OdBCy20/RJIhHhp4+OBPT/oTr0pxIwScYcS6Cs36AuvnEGvFF 2VgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697543913; x=1698148713; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+5nIxvd66FfVpNY2T3qshL/IVW+rqdZ6ZoiBSXZ73PY=; b=P93VGS19WhKQ2IhDFgs0dr6EL5Aqw7bu0OV3hSf4NlQY0+hCk9aIx0mE2i451GszWB cTLzchrRe+PAB5ixboshsPjsGSSoc3JkSwrvys+snDEKMeu0ra8VKrPIS1aINj569J1L 0aIqPS77/L/5Fgj829ksEqp0wQ0gOXLzqHDsBEvhiAQE1BqYS6AVloYonW07MtVtWXpq HloPuJn4e5sSqWb/bdrXoWmhVvPF2jT1C1UuRKaPgPADQsaxUNjQEP6y0FFOPRJIJ3q3 nCrObgqxao6XM8ixWCdu+Lcto6GU/3R4hkhCeQlqOsck+hCMkX0PbRn+/mtp417J0nQz 0XpA== X-Gm-Message-State: AOJu0Yx+TeuEQ4d2bkWbGdcire/g6JDfrJTF9ctD8SxlS2sFVBWrOnky 8/knqbGxvgPskcyH+gcJbqrVs46jwCI= X-Google-Smtp-Source: AGHT+IFjYq1mYAq49pBW1i8/k60W5b8wDOeMMbJIKw2/t+twbWNDeIPT9WYm1YAi40KC7iRLc1Vt9Q== X-Received: by 2002:a2e:9190:0:b0:2c0:196c:e38f with SMTP id f16-20020a2e9190000000b002c0196ce38fmr1730474ljg.1.1697543912733; Tue, 17 Oct 2023 04:58:32 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id w12-20020a2e300c000000b002c5055ab6a8sm223795ljw.102.2023.10.17.04.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 04:58:32 -0700 (PDT) From: Simon Tournier Date: Tue, 17 Oct 2023 13:58:24 +0200 Message-Id: <20231017115824.3369880-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This format had been discussed in * hydra/build-package-metadata.scm (origin->json)[resolve]: Add the keyword 'submodule' when the Git reference is recursive. --- hydra/build-package-metadata.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: 053839dc9457f95792d6dce2e2e73292b9584b30 diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm index 0a75204..6b862eb 100755 --- a/hydra/build-package-metadata.scm +++ b/hydra/build-package-metadata.scm @@ -182,7 +182,10 @@ superseded packages." "recursive")))) '()) ,@(if (eq? method git-fetch) - `(("git_ref" . ,(git-reference-commit uri))) + `(("git_ref" . ,(git-reference-commit uri)) + ,@(if (git-reference-recursive? uri) + '(("submodule" . #true)) + '())) '()) ,@(if (eq? method svn-fetch) `(("svn_revision" . ,(svn-reference-revision uri)))