Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow non-annotated tags from git for setting version #1576

Merged
merged 1 commit into from
Oct 15, 2023

Conversation

heinezen
Copy link
Member

Fixes incorrect version number being displayed in source builds.

@heinezen heinezen added area: buildsystem Related to our cmake/python buildsystem bugfix Restores intended behavior labels Oct 10, 2023
Copy link
Member

@TheJJ TheJJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-describe.html

--tags 

Instead of using only the annotated tags, use any tag found in refs/tags namespace. This option enables matching a lightweight (non-annotated) tag. 

so it used non-annonated tags before, now only annotated tags?

@heinezen
Copy link
Member Author

so it used non-annonated tags before, now only annotated tags?

No it's the other way around

Before this PR: Only annotated tags were used (resulting in 0.4.1 being used as the version number by the build system since this is the last annotated PR)
With this PR: All tags (annotated or not) are considered, i.e. the correct version 0.5.1 should be used

@TheJJ TheJJ merged commit db164ef into SFTtech:master Oct 15, 2023
1 check passed
@heinezen heinezen deleted the fix/version-display branch October 20, 2023 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: buildsystem Related to our cmake/python buildsystem bugfix Restores intended behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants