git.py: added directory tracking to the Moulin git builder #92
Conversation
This file contains 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
Mishytca
force-pushed
the
dev/mykhailo-androsiuk
branch
from
3717183 to
89c742e
Compare
lorc
reviewed
Nov 20, 2023
Mishytca
force-pushed
the
dev/mykhailo-androsiuk
branch
3 times, most recently
from
a9aa902 to
244eae4
Compare
lorc
reviewed
Nov 21, 2023
There was a problem hiding this comment.
With that last comment addressed:
Reviewed-by: Volodymyr Babchuk <[email protected]>
Mishytca
force-pushed
the
dev/mykhailo-androsiuk
branch
from
244eae4 to
374a4ce
Compare
added 2 commits
November 21, 2023 20:32
Change the behavior of the git fetcher so that it doesn't consider two
or more occurrences of the same git repository in the moulin *.yaml
configuration file as an error if the duplicated repository is cloned
into different sub-folders within the build directory.
For example:
domd:
sources:
- type: git
url: "https://github.com/xen-troops/meta-example.git"
rev: ABCDEF
dir: "dir1"
domu:
sources:
- type: git
url: "https://github.com/xen-troops/meta-example.git"
rev: branch_A
dir: "dir2"
Above, identical repositories have different branches. But, also, they
have different 'dir' parameters. So that would not be considered as an
error.
But if they would have identical directories - the error still will be
triggered.
This fix adds the value, that is specified by the user as a 'dir'
parameter of the moulin's 'git' fetcher to the build.ninja file
markers, created during the execution of 'git clone' and 'git checkout'
operations. After this change, if repositories with the same name have
different directories, unique clone_stamp and checkout_stamp file
markers will be created for each repository. In this case, revision
checking of such repositories will not be performed, which is the
desired behavior.
Signed-off-by: Mykhailo Androsiuk <[email protected]>
Reviewed-by: Volodymyr Babchuk <[email protected]>
Fixes: 19d2ec0 ("git.py: Fail on different branches for same repo")
YAMLProcessingError now includes additional information about the directory where a mismatch in repository branches was found. Signed-off-by: Mykhailo Androsiuk <[email protected]> Reviewed-by: Volodymyr Babchuk <[email protected]>
Mishytca
force-pushed
the
dev/mykhailo-androsiuk
branch
from
374a4ce to
d6a0559
Compare
|
Fixed #91 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change the behavior of the git fetcher so that it doesn't consider two
or more occurrences of the same git repository in the moulin *.yaml
configuration file as an error if the duplicated repository is cloned
into different sub-folders within the build directory.
For example:
Above, identical repositories have different branches. But, also, they
have different 'dir' parameters. So that would not be considered as an
error.
But if they would have identical directories - the error still will be
triggered.