-
Notifications
You must be signed in to change notification settings - Fork 568
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
build: add missing makefile dep & syntax improvements #5956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Make the non-phony targets that are defined in the root Makefile depend on it, to ensure that they get re-generated if their recipes change. Note that these targets are generated nearly instantly, so this should not noticeably affect rebuild times. Relates to netblue30#5627.
Relates to netblue30#5627.
kmk3
force-pushed
the
build-fix-dep-syntax
branch
from
August 14, 2023 03:39
3975e31
to
53049cc
Compare
Escape `.` only when generating the syntax files rather than directly in the syntax lists, so that the latter contain the command names as is. This also makes the escaping apply to the arg1 syntax list as well. Note: Double escaping (`\\\\.`) is used in `regex_fromlf` because its output is used in another sed replacement (where it needs to be `\\.`). Relates to netblue30#5627.
kmk3
force-pushed
the
build-fix-dep-syntax
branch
from
August 14, 2023 21:18
53049cc
to
204c45a
Compare
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Aug 20, 2023
Considering the most recent runs, this reduces the total amount of time it takes to run the tests from about 9-10 minutes to about 3 minutes. Note: Which jobs are split is mostly determined by how long each test takes. For example, this is the time each test step took in a run of `build_and_test` (10m17s total for the job) on commit bfcf8bc ("Merge pull request netblue30#5956 from kmk3/build-fix-dep-syntax", 2023-08-14)[1]: * 17s test-seccomp-extra * 1s test-firecfg * 16s test-capabilities * 6s test-apparmor * 10s test-appimage * 10s test-chroot * 41s test-sysutils * 24s test-private-etc * 40s test-profiles * 4s test-fcopy * 2s test-fnetfilter * 98s test-fs * 103s test-utils * 57s test-environment * 69s test-network [1]: https://github.com/netblue30/firejail/actions/runs/5860927500/job/15890009169
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Aug 22, 2023
Considering the most recent runs, this reduces the total amount of time it takes to run the tests from about 9-10 minutes to about 3 minutes. Note: Which jobs are split is mostly determined by how long each test takes. For example, this is the time each test step took in a run of `build_and_test` (10m17s total for the job) on commit bfcf8bc ("Merge pull request netblue30#5956 from kmk3/build-fix-dep-syntax", 2023-08-14)[1]: * 17s test-seccomp-extra * 1s test-firecfg * 16s test-capabilities * 6s test-apparmor * 10s test-appimage * 10s test-chroot * 41s test-sysutils * 24s test-private-etc * 40s test-profiles * 4s test-fcopy * 2s test-fnetfilter * 98s test-fs * 103s test-utils * 57s test-environment * 69s test-network [1]: https://github.com/netblue30/firejail/actions/runs/5860927500/job/15890009169
kmk3
added a commit
that referenced
this pull request
Aug 23, 2023
kmk3
added a commit
that referenced
this pull request
Aug 24, 2024
Related commits: * 9e206b7 ("rework src/man Makefile", 2023-07-07) * 2b34747 ("generate seccomp filters at install time", 2023-07-07) * 1d5fff9 ("Makefile fix", 2023-07-10) * 6fa19aa ("feature: use seccomp filters build at install time for --restrict-namespaces", 2023-07-12) * a6172b7 ("build: remove extraneous blank lines in makefiles", 2023-07-12) * 80eb284 ("build: restore seccomp filter targets", 2023-07-13) / PR #5898 * 76bd5ad ("build: simplify code related to man pages", 2023-07-12) / PR #5898 * 8e79f18 ("build: add missing makefile dep", 2023-08-12) / PR #5956 Note: The issue with seccomp filters specifically was fixed on commit 80eb284 ("build: restore seccomp filter targets", 2023-07-13) / PR #5898. Relates to #5156 #5898 #5956.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make the non-phony targets that are defined in the root Makefile depend
on it, to ensure that they get re-generated if their recipes change.
Note that these targets are generated nearly instantly, so this should
not noticeably affect rebuild times.
Relates to #5627.