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

dnf sbom: use same logic for our version number too #14691

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

Habbie
Copy link
Member

@Habbie Habbie commented Sep 19, 2024

Short description

this turns 4.8.0 into 4.8.0-0.beta1.authnodynnoso.3731.g201e03656.1pdns.el8, which is what rpm -qa also prints (except we leave out pdns- in front and .x86_64 at the tail)

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master

@Habbie Habbie added this to the common-soon milestone Sep 19, 2024
Copy link
Member

@rgacogne rgacogne left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks!

@Habbie
Copy link
Member Author

Habbie commented Sep 19, 2024

@coveralls
Copy link

coveralls commented Sep 19, 2024

Pull Request Test Coverage Report for Build 10959047392

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 17 unchanged lines in 5 files lost coverage.
  • Overall coverage increased (+0.03%) to 64.686%

Files with Coverage Reduction New Missed Lines %
pdns/recursordist/syncres.cc 1 79.37%
pdns/recursordist/test-syncres_cc2.cc 3 88.91%
pdns/opensslsigners.cc 3 61.34%
modules/godbcbackend/sodbc.cc 4 70.8%
pdns/recursordist/test-syncres_cc1.cc 6 89.59%
Totals Coverage Status
Change from base Build 10939216509: 0.03%
Covered Lines: 124798
Relevant Lines: 162218

💛 - Coveralls

@Habbie
Copy link
Member Author

Habbie commented Sep 19, 2024

$ find . -name 'pdns-0*rpm' | grep x86_64 | grep -v el7
./0.0.5.0.dnfsbomversion.g4f1655a24/pdns-0.0.5.0.dnfsbomversion.g4f1655a24-el-8/pdns-0.0.5-dnfsbomversion.0.g4f1655a24.1pdns.el8.x86_64.rpm
./0.0.5.0.dnfsbomversion.g4f1655a24/pdns-0.0.5.0.dnfsbomversion.g4f1655a24-el-9/pdns-0.0.5-dnfsbomversion.0.g4f1655a24.1pdns.el9.x86_64.rpm
./0.0.5/pdns-0.0.5-el-8/pdns-0.0.5-1pdns.el8.x86_64.rpm
./0.0.5/pdns-0.0.5-el-9/pdns-0.0.5-1pdns.el9.x86_64.rpm
$ find . -name 'pdns-0*.json' | xargs cat | jq .metadata.component.version
"0.0.5-dnfsbomversion.0.g4f1655a24.1pdns.el8"
"0.0.5-dnfsbomversion.0.g4f1655a24.1pdns.el9"
"0.0.5-1pdns.el8"
"0.0.5-1pdns.el9"

looks right to me

@Habbie Habbie merged commit 0de9aac into PowerDNS:master Sep 20, 2024
79 checks passed
@Habbie Habbie deleted the dnf-sbom-version branch September 20, 2024 13:19
@Habbie Habbie mentioned this pull request Sep 20, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants