diff mbox series

[bug#66491,v2] hydra: build-package-metadata: Add boolean for Git submodules in sources.json.

Message ID 20231017115824.3369880-1-zimon.toutoune@gmail.com
State New
Headers show
Series [bug#66491,v2] hydra: build-package-metadata: Add boolean for Git submodules in sources.json. | expand

Commit Message

Simon Tournier Oct. 17, 2023, 11:58 a.m. UTC 
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(-)


base-commit: 053839dc9457f95792d6dce2e2e73292b9584b30

Comments

Mathieu Othacehe Oct. 17, 2023, 12:29 p.m. UTC | #1 
> * hydra/build-package-metadata.scm (origin->json)[resolve]: Add the keyword
> 'submodule' when the Git reference is recursive.

Pushed, thanks!

Mathieu
diff mbox series

Patch

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)))