-
Notifications
You must be signed in to change notification settings - Fork 287
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
chore: Simplify coverage dockerfile. #2679
base: master
Are you sure you want to change the base?
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2679 +/- ##
==========================================
+ Coverage 73.02% 73.04% +0.01%
==========================================
Files 148 148
Lines 30482 30482
==========================================
+ Hits 22261 22265 +4
+ Misses 8221 8217 -4 ☔ View full report in Codecov by Sentry. |
!other/pkgconfig/* | ||
!other/rpm/* | ||
!so.version | ||
!other/docker/coverage/run_mallocfail |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this file committed by a mistake? It's supposedly auto-generated by ../sources/run.sh
when called by coverage/run
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, it's not a mistake. This file has to be in git because otherwise a default "build this docker file" action (github or render.com) doesn't work the way it should.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh. So, whenever someone changes either the master dockerignore file in other/docker/sources/
, or a supplemental one in other/docker/$BUILD/
, they would have to run the other/$BUILD/run
script(s) to update the concatenated dockerignore file(s) before committing/making a PR?
Maybe we could add a script step to the GitHub CI before the "build this docker file" action that would generate this dockerignore file? For example, move the dockerignore concat section out of other/docker/sources/ru.sh
into its own bash script, something like other/docker/source/gen-dockerignore.sh
that takes $BUILD
as an argument (or a path to $BUILD
's directory or something like that) and concats the master dockerignore with the $BUILD
's, putting it in $BUILD
's directory? That script could be used in CI to generate the dockerignore file before calling the docker actions and will also be called from other/docker/sources/run.sh
.
(Also, what is this render.com promotion? How is that relevant to us?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- https://toxcov.onrender.com/
- https://doxygen.onrender.com/
- https://webtox.onrender.com/
- Also automerge runs on render.com
Ok, I'll do that, but it'll take some time for me to find motivation for it, so I'll move this PR to the next milestone.
a6518b4
to
72ff594
Compare
Use per-dockerfile dockerignore instead of sources for coverage. It's a bit more duplication (dockerignore is copied out of the sources one), but it's a bit more efficient and works in more situations (e.g. one where you can only build 1 dockerfile such as on render.com).
72ff594
to
71cd8de
Compare
Use per-dockerfile dockerignore instead of sources for coverage. It's a bit more duplication (dockerignore is copied out of the sources one), but it's a bit more efficient and works in more situations (e.g. one where you can only build 1 dockerfile such as on render.com).
This change is