Skip to content

cmake: Make git describe handle non-annotated tags #14986

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

Closed
wants to merge 1 commit into from

Conversation

galak
Copy link
Collaborator

@galak galak commented Mar 28, 2019

If we tag via github a pre-release we don't get an annotated tag. So
the BUILD_VERSION isn't reported correctly. We can fix this via adding
--tags to 'git describe'.

Fixes #14985

Signed-off-by: Kumar Gala [email protected]

If we tag via github a pre-release we don't get an annotated tag.  So
the BUILD_VERSION isn't reported correctly.  We can fix this via adding
--tags to 'git describe'.

Fixes zephyrproject-rtos#14985

Signed-off-by: Kumar Gala <[email protected]>
@galak galak requested a review from marc-hb March 28, 2019 14:33
@galak galak added this to the v1.14.0 milestone Mar 28, 2019
@galak galak added bug The issue is a bug, or the PR is fixing a bug area: Build System labels Mar 28, 2019
@nashif
Copy link
Member

nashif commented Mar 28, 2019

Do we want to allow non-annotated tags for the releases? I would fix the tag that was created already as non-annotated instead and make sure we create the tags on the command line in the future instead of using github.

@marc-hb
Copy link
Collaborator

marc-hb commented Mar 28, 2019

Agree with @nashif , a release shouldn't be based on a light-weight tag which doesn't even have an author's name. git help tag:

Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like git describe) will ignore lightweight tags by default.

Linux kernel release are based on --sign ed tags.

I'm surprised github lets people create releases based on a light-weight tag, does it?

Now you could still want describe --tag for other reasons (I don't), but not to create a release and fix issue #14985 Hopefully you can just delete the v1.14-N light-weight tag.

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@672607c). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #14986   +/-   ##
=========================================
  Coverage          ?   52.92%           
=========================================
  Files             ?      309           
  Lines             ?    45266           
  Branches          ?    10451           
=========================================
  Hits              ?    23955           
  Misses            ?    16543           
  Partials          ?     4768

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 672607c...7be80cb. Read the comment docs.

@galak
Copy link
Collaborator Author

galak commented Mar 28, 2019

Closing this, agreed we should tag by hand to get annotated tags.

@galak galak closed this Mar 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Build System bug The issue is a bug, or the PR is fixing a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clarify in release docs NOT to use github tagging.
4 participants