Workaround for fetching git submodules for flakes#1356
Open
RichardWarfield wants to merge 2 commits intoNixOS:masterfrom
Open
Workaround for fetching git submodules for flakes#1356RichardWarfield wants to merge 2 commits intoNixOS:masterfrom
RichardWarfield wants to merge 2 commits intoNixOS:masterfrom
Conversation
If a flake URI contains 'submodules=1' in the query part then any submodules should be fetched/initialized. At present, hydra-eval-jobset uses the 'url' field of the flake metadata as the flake URI. This URI is missing the 'submodules=1' query, which is present elsewhere in the metadata. This PR appends "&submodules=1" if the flake metadata indicates submodules are used (specifically, if the resolved.submodules field is true).
Ma27
reviewed
Feb 13, 2024
Member
Ma27
left a comment
Ma27
left a comment
There was a problem hiding this comment.
I think a testcase for that would be nice.
| my $decoded = decode_json($json); | ||
| my $url = $decoded->{'url'}; # Doesn't have the &submodules=1, so add it back if needed | ||
| if ($decoded->{'resolved'}->{'submodules'}) { | ||
| $url = $url . "&submodules=1"; |
Member
There was a problem hiding this comment.
Is it safe that each $url has a query param already (i.e. ?foo=bar), otherwise the URL (git+file://foo&submodules=1 e.g.) is probably invalid.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workaround/fix for 1353
If a flake URI contains 'submodules=1' in the query part then any submodules should be fetched/initialized.
At present, hydra-eval-jobset uses the 'url' field of the flake metadata as the flake URI. This URI is missing the 'submodules=1' query, which is present elsewhere in the metadata.
This PR appends "&submodules=1" if the flake metadata indicates submodules are used (specifically, if the resolved.submodules field is true).