makesystem: speedup pkg cloning if no git-cache is available#16316
Merged
kfessel merged 1 commit intoRIOT-OS:masterfrom Apr 13, 2022
Merged
makesystem: speedup pkg cloning if no git-cache is available#16316kfessel merged 1 commit intoRIOT-OS:masterfrom
kfessel merged 1 commit intoRIOT-OS:masterfrom
Conversation
Member
|
Maybe it makes more sense to clone with E.g. I would expect developers contributing to e.g. NanoCBOR to have the corresponding Repo cloned elsewhere with full history anyway. Maybe @bergzand and @benpicco have an opinion, as they contribute to other stuff packed in RIOT as well. |
Contributor
Author
|
i think you can't clone non braches -> --depth=1 will give you a branch that you do not want since RIOT pkgs want arbitrary commits |
Contributor
Author
|
If I take the wolfssl example the complete history is 9 MiB while the blobs are 150 MiB (wee need 7 of them) -> this this saves us ~89% but have all history at hand. |
|
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. If you want me to ignore this issue, please mark it with the "State: don't stale" label. Thank you for your contributions. |
Contributor
|
Does gitcache need the blobs? If not can't we do the same thing in all cases and not include blobs? |
Contributor
Author
I think the profit wouldn't be worth it with git cache (if you are not short on diskspace on the build system (looking at murdock we are talking about the compile result cache which will be much bigger than what we would safe with this)) -the download size is also less of an issue with a git cache (--- I do not use git cache -> i can not speak much for its usage patters)
|
21b6493 to
b3b2ffa
Compare
Contributor
Author
|
@maribu : you might want to have a look at this i changed it to clone without history (depth=1) |
Member
|
Code looks good to me. Please squash :) |
b3b2ffa to
6e3c1f0
Compare
6e3c1f0 to
9566eba
Compare
there is no git clone left since git clone does not support getting specific commits ->: - init empty repo, - setup remote origin - configure - fetch - checkout
9566eba to
cc3fc8e
Compare
Contributor
Author
|
rebased an squashed tried to avoid getting all tags - sadly some git segfaults in that case (so get all tags without blobs) Would just get one tag or(if that fails) branch/commit but the github tools-buildtest action does not like that -> back to filter blobs |
Contributor
Author
|
The Murdock failure left is not related to this PR see #17894. I think we can skip compile. |
Member
|
I did this for testing: As seen, a chunk of storage is saved and the cloning subjectively felt faster with this PR. Hence, this works as advertised. And Murdock will do the regression testing :) |
Contributor
|
The failure of tests/congure_reno/microbit:gnu should be unrelated. |
maribu
approved these changes
Apr 13, 2022
Member
maribu
left a comment
There was a problem hiding this comment.
ACK. As above shown I could confirm that storage requirements are reduced as advertised. Builds with git cache still work (as tested by Murdock with good test coverage) and without (as tested by hand with limited test coverage).
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
6 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.
Contribution description
This clones repositories used by pkgs without downloading all the history. Due to git clone not being able to load a specific commit: this initializes the packages directory (PKG_SOURCE_DIR) adds the remote configures it and fetches the least amount of data to checkout the PKG_VERSION (commit-id or branch or tag)
for example: this reduces the download of wolfssl from 159.42 MiB to 9.70 MiB + 6.65 MiB ~=16.35MiB
this method or the previous git cache method is selected by the availability of the PATH named by $(GIT_CACHE_DIR) (default: $HOME/.gitcache)
Testing procedure
make a test/example that uses a pkg that uses a git repo
Issues/PRs references
non to my knowledge