bug#66491: closed ([maintenance] hydra: build-package-metadata: Add boolean for Git submodules in sources.json.)

[GNU bug Tracking System]

Your message dated Tue, 17 Oct 2023 14:29:28 +0200
with message-id <87fs29mnyv.fsf_-_@gnu.org>
and subject line Re: bug#66491: [maintenance] hydra: build-package-metadata: 
Add boolean for Git submodules in sources.json.
has caused the debbugs.gnu.org bug report #66491,
regarding [maintenance] hydra: build-package-metadata: Add boolean for Git 
submodules in sources.json.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
66491: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66491
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [maintenance] hydra: build-package-metadata: Add boolean for Git submodules in sources.json.
>
>
>
>
> Date: 
>
> Thu, 12 Oct 2023 14:39:31 +0200
>
>
>
>
> This format had been discussed in
> <https://gitlab.softwareheritage.org/swh/devel/swh-loader-git/-/issues/4751#note_150607>
>
> * 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(-)
>
> Hi,
>
> This patch helps on SWH side.
>
>         Nevertheless, if it is possible from your side to add a new boolean 
> field in
>         the JSON file (submodules ?) indicating that submodules should be 
> fetched to
>         compute the hash, this will simplify the processing from our side.
>
> <https://gitlab.softwareheritage.org/swh/devel/swh-loader-git/-/issues/4751#note_150593>
>
> Cheers,
> simon
>
>
> diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm
> index 0a75204..9f90c5e 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)))
>
> base-commit: 8f703892a6d549d52eb0374deb11d6af734065d4
> -- 
> 2.38.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#66491: [maintenance] hydra: build-package-metadata: Add boolean for Git submodules in sources.json.
>
>
>
>
> Date: 
>
> Tue, 17 Oct 2023 14:29:28 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> > * hydra/build-package-metadata.scm (origin->json)[resolve]: Add the keyword
> > 'submodule' when the Git reference is recursive.
>
> Pushed, thanks!
>
> Mathieu
>
>
> --- End Message ---