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

Fix version tag regex failure when HEAD is tagged #1583

Merged
merged 1 commit into from
Oct 18, 2023

Conversation

heinezen
Copy link
Member

@heinezen heinezen commented Oct 17, 2023

Our buildsystem expects version tags in the format v1.2.3-4-g00abcdef (tag + commit distance to tag + commit hash). However, since #1576 we call git describe --tags. When HEAD is tagged, this command only outputs the tag and omits commit distance and commit hash (only v1.2.3 is returned). This results in a configure failure since our regex cannot match the version format in this case.

This PR switches the version fetch command to git describe --tags --long, so that the long format is always used.

@heinezen heinezen added area: buildsystem Related to our cmake/python buildsystem bugfix Restores intended behavior labels Oct 17, 2023
@TheJJ TheJJ merged commit e83bb4e into SFTtech:master Oct 18, 2023
@heinezen heinezen deleted the fix/version-tag-format 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