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.

Sign up for GitHub

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

Jump to bottom

Fix version scripts for some shallow clone situations (fix #1549) #2608

Merged
merged 3 commits into from
Jun 13, 2023
Merged

Fix version scripts for some shallow clone situations (fix #1549) #2608

merged 3 commits into from
Jun 13, 2023

Conversation

itchyny
Copy link
Contributor

@itchyny itchyny commented Jun 11, 2023 •
edited
Loading

I noticed that in some shallow clone situations autoreconf -fi fails on detecting the version. In some situations tags are reachable but git describe fails. Further reference: #1549 (comment). Resolves #1549.

@itchyny itchyny added the build label Jun 11, 2023
wader
wader approved these changes Jun 11, 2023
View reviewed changes
Copy link
Member

@wader wader left a comment

Choose a reason for hiding this comment

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

Based on your comment in #1549 it looks good it think. Wonder if it would be possible to use scripts/version for jq_version? maybe for the future if so

btw i noticed this while poking around how the verison string is generated https://github.com/jqlang/jq/blob/master/docs/site.yml#L7 the -dirty should probably not be there?

@itchyny
Copy link
Contributor Author

itchyny commented Jun 13, 2023

The version variable in site.yml is not used anymore so we can clean up including the default template and Makefile.am. The commit 81f328f#diff-45b410e29e049ce4fc88cfc7a4e4c518107fe97593820edcf316591536f202c7L54 removed the $JQ_VERSION placeholder from the manual source.

@itchyny
Copy link
Contributor Author

itchyny commented Jun 13, 2023

Is there any objection to use scripts/version in configure.ac?

@wader
Copy link
Member

wader commented Jun 13, 2023

I think it makes sense if they use the same version format already?

@itchyny
Copy link
Contributor Author

itchyny commented Jun 13, 2023

Thank you.

@itchyny itchyny merged commit 433b79d into jqlang:master Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wader wader wader approved these changes

Assignees
No one assigned
Labels
build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@itchyny @wader