Cutter version overrides and git query fix #3422
Merged
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
* Explicitly specify repo directory when querying git information. Should reduce the chance of getting wrong build number in certain build setups. For example:
- build_recipe_repo
- .git
- recipe
- patches
- build
- cutter-src
- .git
* Add option for disabling use of git hash in version in case it's incompatible
with setup used for building distro specific packages.
* Add option for additional version suffix. Can be used for package build number.
3 tasks
wargio
approved these changes
Mar 11, 2025
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.
Your checklist for this pull request
Detailed description
Alternative approach for #3421
The fix isn't perfect, but it should be better than before.
It will probably still fail if cutter-src has no .git folder.Test plan (required)
(testing in progress)
Fresh checkout no additional args -> should have appropriate branch/hash ✔️
add additional commit and do a rebuild -> hash number should be updated ✔️ (need to run cmake, but value is correct even though config values from CMakeCache are reused).
Fresh build with CUTTER_VERSION_SUFFIX and CUTTER_INCLUDE_GIT_HASH ✔️
Fresh Build with nested repositories as described above, no additional args -> should use the hash of cutter repo not top folder ✔️
Fresh build without any git folders ✔️
Closing issues