Skip to content

bareos-version-from-git: fix output for wip tags#2019

Merged
BareosBot merged 5 commits intobareos:masterfrom
sebsura:dev/ssura/master/make-long-describe
Dec 11, 2024
Merged

bareos-version-from-git: fix output for wip tags#2019
BareosBot merged 5 commits intobareos:masterfrom
sebsura:dev/ssura/master/make-long-describe

Conversation

@sebsura
Copy link
Contributor

@sebsura sebsura commented Nov 18, 2024

If the current checkout is tagged as WIP, then git describe will not attach a git hash to its name. This git hash is needed/expected by some of our build tooling.
As such we should tell git to always emit a git hash (except for releases).

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

@arogge arogge added bugfix bug This addresses a bug labels Nov 26, 2024
@arogge arogge added this to the 24.0.0 milestone Nov 26, 2024
@arogge arogge requested a review from joergsteffens November 26, 2024 10:39
Copy link
Member

@joergsteffens joergsteffens left a comment

Choose a reason for hiding this comment

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

Loos good, it just needs a rebase for the CHANGELOG.

@sebsura sebsura force-pushed the dev/ssura/master/make-long-describe branch 2 times, most recently from c338c02 to a4cb0d7 Compare December 5, 2024 07:21
@pstorz pstorz force-pushed the dev/ssura/master/make-long-describe branch from a4cb0d7 to c6cbb13 Compare December 10, 2024 21:15
sebsura and others added 4 commits December 10, 2024 22:17
If the current checkout is tagged as WIP, then git describe will not
attach a git hash to its name.  This git hash is needed/expected by
some of our build tooling.
As such we should tell git to always emit a git hash (except for
releases).
@pstorz pstorz force-pushed the dev/ssura/master/make-long-describe branch from c6cbb13 to 9036113 Compare December 10, 2024 21:17
@BareosBot BareosBot merged commit a877ec5 into bareos:master Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug This addresses a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Comments