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

Force various files to be skipped when generating git archives #15078

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

eli-schwartz
Copy link
Contributor

Meson utilizes git archive as the first step in producing a release tarball. Certain files don't need to be distributed in release tarballs at all -- namely, files used by git itself, or by github when processing a git repository for e.g. CI purposes. They have no use case outside of a git repo -- not even as documentation.

Exclude these files from the tarball. This affects both meson dist and the github autogenerated tarballs on the Tags page. More work is needed to have meson dist reach parity with automake's make distcheck, but this is a start.

Meson utilizes `git archive` as the first step in producing a release
tarball. Certain files don't need to be distributed in release tarballs
at all -- namely, files used by git itself, or by github when processing
a git repository for e.g. CI purposes. They have no use case outside of
a git repo -- not even as documentation.

Exclude these files from the tarball. This affects both `meson dist` and
the github autogenerated tarballs on the Tags page. More work is needed
to have `meson dist` reach parity with automake's `make distcheck`, but
this is a start.
@coveralls
Copy link

coveralls commented Jan 23, 2025

Pull Request Test Coverage Report for Build 12923186625

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.
  • 20 unchanged lines in 8 files lost coverage.
  • Overall coverage increased (+0.08%) to 64.761%

Files with Coverage Reduction New Missed Lines %
pdns/misc.cc 1 62.82%
ext/json11/json11.cpp 1 64.9%
pdns/backends/gsql/gsqlbackend.hh 1 98.29%
pdns/dnsdistdist/dnsdist-tcp.cc 1 76.53%
pdns/pollmplexer.cc 1 83.66%
pdns/tsigverifier.cc 3 77.22%
pdns/recursordist/syncres.cc 4 80.34%
pdns/packethandler.cc 8 72.4%
Totals Coverage Status
Change from base Build 12905504248: 0.08%
Covered Lines: 127853
Relevant Lines: 166432

💛 - Coveralls

@omoerbeek
Copy link
Member

omoerbeek commented Jan 24, 2025

Thanks! There is no need for 100% parity, but these files can certainly be skipped.

@omoerbeek omoerbeek requested a review from Habbie January 24, 2025 08:19
@Habbie
Copy link
Member

Habbie commented Jan 24, 2025

LGTM. If you happen to have that autotools vs. meson tarball contents diff, I am interested :)

@eli-schwartz
Copy link
Contributor Author

meson without this PR ---> meson with this PR: meson-dist-15078.txt

autotools ---> meson with this PR: autotools-to-meson-dist.txt

@Habbie
Copy link
Member

Habbie commented Jan 24, 2025

oops. that question was for Otto, as I know he has the diff. But, thanks!

@eli-schwartz
Copy link
Contributor Author

I happened to have the diff too. :)

@omoerbeek
Copy link
Member

omoerbeek commented Jan 26, 2025

The distfile created from the pdns root using meson is larger as the autotools distfile only includes the authoritative server related files and dnsdist and recursor each have their own distfile, created from the dnsdistdist and recursordist subdirs. #15076 is my PR to create the recursor tarball using meson.

@miodvallat miodvallat merged commit 8eb5da7 into PowerDNS:master Jan 27, 2025
81 checks passed
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.

5 participants