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

build: reduce hardcoding and inconsistencies #6230

Merged
merged 10 commits into from
Feb 29, 2024

Conversation

kmk3
Copy link
Collaborator

@kmk3 kmk3 commented Feb 29, 2024

Main changes:

  • build: reduce TARNAME hardcoding
  • build: standardize parallel make arguments
  • build: standardize ./configure arguments

Relates to #5148 #5960 #6224.

This is a follow-up to #6222.

To reduce TARNAME hardcoding.
@kmk3 kmk3 force-pushed the build-reduce-inconsistencies branch from 3309314 to 730d1f2 Compare February 29, 2024 11:30
kmk3 added 9 commits February 29, 2024 08:52
To reduce TARNAME hardcoding.

Added on commit 6a89ab0 ("ci: run firejail --version after
build/install", 2022-05-16) / PR netblue30#5148.
To reduce hardcoding.

Note that this reduces duplication but the value is still hardcoded in
the job; it is not sourced from TARNAME in config.mk.
Sync the build and build-clang jobs.
test/ also contains source code and cppcheck checks it:

    $ make cppcheck | grep 'Checking test/'
    Checking test/appimage/main.c ...
    Checking test/chroot/unchroot.c ...
    Checking test/filters/namespaces.c ...
    Checking test/seccomp-extra/memwrexe.c ...

So make sure that it is included in the CI trigger paths.
To make it easier to compare and edit the main apt-based jobs in
.gitlab-ci.yml.
Format it for readability and update the descriptions to match the
current jobs.
Line-wrap the file and sort ./configure arguments.
Currently the number of make jobs used for the default build target are
hardcoded and the value used varies across files.

For consistency (and potentially better performance), use
`make -j "$(nproc)"` everywhere that `make -j` is currently used.

Kind of relates to commit 500d8f2 ("ci: run make in parallel where
applicable", 2023-08-14) / PR netblue30#5960.
For consistency and to make it clearer where jobs differ (for example,
to see where `--enable-analyzer` is used).

Changes:

* Always use --prefix=/usr and --enable-fatal-warnings (except in the
  Alpine job due to current warnings; see netblue30#6224)
* Use the same argument order

Note: mkdeb.sh and platform/rpm/mkrpm.sh already pass `--prefix=/usr` to
./configure.
@kmk3 kmk3 force-pushed the build-reduce-inconsistencies branch from 730d1f2 to 2301ab2 Compare February 29, 2024 11:54
@netblue30 netblue30 merged commit 8c4cc9a into netblue30:master Feb 29, 2024
13 checks passed
@netblue30
Copy link
Owner

merged, let's try it!

@kmk3 kmk3 deleted the build-reduce-inconsistencies branch March 1, 2024 04:45
kmk3 added a commit that referenced this pull request Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done (on RELNOTES)
Development

Successfully merging this pull request may close these issues.

2 participants