mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-15 14:16:14 -06:00
ci: make all main make steps parallel and sync output (#7162)
Some checks failed
Build-extra / build-gcc (push) Has been cancelled
Build-extra / build-clang (push) Has been cancelled
Build / build (push) Has been cancelled
Check-C / scan-build (push) Has been cancelled
Check-C / cppcheck (push) Has been cancelled
Check-C / codeql-cpp (push) Has been cancelled
Check-Profiles / profile-checks (push) Has been cancelled
Codespell / codespell (push) Has been cancelled
Test / test-main (push) Has been cancelled
Test / test-fs (push) Has been cancelled
Test / test-environment (push) Has been cancelled
Test / test-utils (push) Has been cancelled
Test / test-network (push) Has been cancelled
Some checks failed
Build-extra / build-gcc (push) Has been cancelled
Build-extra / build-clang (push) Has been cancelled
Build / build (push) Has been cancelled
Check-C / scan-build (push) Has been cancelled
Check-C / cppcheck (push) Has been cancelled
Check-C / codeql-cpp (push) Has been cancelled
Check-Profiles / profile-checks (push) Has been cancelled
Codespell / codespell (push) Has been cancelled
Test / test-main (push) Has been cancelled
Test / test-fs (push) Has been cancelled
Test / test-environment (push) Has been cancelled
Test / test-utils (push) Has been cancelled
Test / test-network (push) Has been cancelled
Changes:
* Use `scan-build make` instead of running `scan-build` inside of `make`
(this appears to be necessary for the output synchronization to work)
* Use `-j "$(nproc)"` and `-Orecurse` for the main `make` step in all
jobs (including where this step is currently not parallel)
The main drawback of using parallel make (`-j`) is that the output of
different jobs may be printed interspersed, which makes the output
harder to read and less stable across multiple executions.
Example:
job1: line1
job1: line2
job2: line1
job3: line1
job1: line3
Using `-Orecurse` should fix this by ensuring that the output of all
jobs is still printed sequentially in the order that the jobs were
executed (that is, as if `-j` was not used), even if the jobs themselves
are executed in parallel.
This should ensure that the main `make` step in each job runs its
targets in parallel and has a stable output at the same time, making it
easier to compare the logs of the same job across different CI runs.
Note: The `-O` flag is specific to GNU make and was added in version 4.0
(2013-10-09).
Related commits:
* 500d8f2d6 ("ci: run make in parallel where applicable", 2023-08-14) /
PR #5960
* 1f6400bd8 ("build: sync scan-build target with CI", 2024-02-24) /
PR #6222
This commit is contained in:
parent
fce18b90f3
commit
f2df11ae37
5 changed files with 26 additions and 18 deletions
4
.github/workflows/build-extra.yml
vendored
4
.github/workflows/build-extra.yml
vendored
|
|
@ -68,7 +68,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
@ -103,7 +103,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
|
||||||
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -73,7 +73,7 @@ jobs:
|
||||||
--disable-apparmor --disable-selinux
|
--disable-apparmor --disable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
|
||||||
6
.github/workflows/check-c.yml
vendored
6
.github/workflows/check-c.yml
vendored
|
|
@ -67,12 +67,12 @@ jobs:
|
||||||
run: ./ci/printenv.sh
|
run: ./ci/printenv.sh
|
||||||
- name: configure
|
- name: configure
|
||||||
run: >
|
run: >
|
||||||
./configure CC=clang-14 SCAN_BUILD=scan-build-14
|
./configure CC=clang-14
|
||||||
--prefix=/usr --enable-fatal-warnings
|
--prefix=/usr --enable-fatal-warnings
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: scan-build
|
- name: scan-build
|
||||||
run: make -j "$(nproc)" scan-build
|
run: scan-build-14 make -j "$(nproc)" -Orecurse
|
||||||
|
|
||||||
cppcheck:
|
cppcheck:
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
@ -139,7 +139,7 @@ jobs:
|
||||||
run: ./configure || (cat config.log; exit 1)
|
run: ./configure || (cat config.log; exit 1)
|
||||||
|
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
|
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225
|
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225
|
||||||
|
|
|
||||||
10
.github/workflows/test.yml
vendored
10
.github/workflows/test.yml
vendored
|
|
@ -78,7 +78,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
@ -127,7 +127,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
@ -168,7 +168,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
@ -211,7 +211,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
@ -258,7 +258,7 @@ jobs:
|
||||||
--enable-apparmor --enable-selinux
|
--enable-apparmor --enable-selinux
|
||||||
|| (cat config.log; exit 1)
|
|| (cat config.log; exit 1)
|
||||||
- name: make
|
- name: make
|
||||||
run: make -j "$(nproc)"
|
run: make -j "$(nproc)" -Orecurse
|
||||||
- name: make install
|
- name: make install
|
||||||
run: sudo make install
|
run: sudo make install
|
||||||
- name: make installcheck
|
- name: make installcheck
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,9 @@ build_ubuntu_package:
|
||||||
- ./ci/printenv.sh
|
- ./ci/printenv.sh
|
||||||
- ./configure || (cat config.log; exit 1)
|
- ./configure || (cat config.log; exit 1)
|
||||||
- make dist
|
- make dist
|
||||||
- ./mkdeb.sh --enable-fatal-warnings
|
- >
|
||||||
|
MAKEFLAGS="$MAKEFLAGS -Orecurse" ./mkdeb.sh
|
||||||
|
--enable-fatal-warnings
|
||||||
- dpkg -i ./*.deb
|
- dpkg -i ./*.deb
|
||||||
- make installcheck
|
- make installcheck
|
||||||
|
|
||||||
|
|
@ -41,7 +43,9 @@ build_debian_package:
|
||||||
- ./ci/printenv.sh
|
- ./ci/printenv.sh
|
||||||
- ./configure || (cat config.log; exit 1)
|
- ./configure || (cat config.log; exit 1)
|
||||||
- make dist
|
- make dist
|
||||||
- ./mkdeb.sh --enable-fatal-warnings
|
- >
|
||||||
|
MAKEFLAGS="$MAKEFLAGS -Orecurse" ./mkdeb.sh
|
||||||
|
--enable-fatal-warnings
|
||||||
- dpkg -i ./*.deb
|
- dpkg -i ./*.deb
|
||||||
- make installcheck
|
- make installcheck
|
||||||
|
|
||||||
|
|
@ -60,8 +64,8 @@ build_no_apparmor:
|
||||||
- ./configure || (cat config.log; exit 1)
|
- ./configure || (cat config.log; exit 1)
|
||||||
- make dist
|
- make dist
|
||||||
- >
|
- >
|
||||||
./mkdeb.sh --enable-fatal-warnings
|
MAKEFLAGS="$MAKEFLAGS -Orecurse" ./mkdeb.sh
|
||||||
--disable-apparmor
|
--enable-fatal-warnings --disable-apparmor
|
||||||
- dpkg -i ./*.deb
|
- dpkg -i ./*.deb
|
||||||
- make installcheck
|
- make installcheck
|
||||||
- make installcheck | grep -F 'AppArmor support is disabled'
|
- make installcheck | grep -F 'AppArmor support is disabled'
|
||||||
|
|
@ -75,7 +79,9 @@ build_redhat_package:
|
||||||
- ./ci/printenv.sh
|
- ./ci/printenv.sh
|
||||||
- ./configure || (cat config.log; exit 1)
|
- ./configure || (cat config.log; exit 1)
|
||||||
- make dist
|
- make dist
|
||||||
- ./platform/rpm/mkrpm.sh --enable-fatal-warnings
|
- >
|
||||||
|
MAKEFLAGS="$MAKEFLAGS -Orecurse" ./platform/rpm/mkrpm.sh
|
||||||
|
--enable-fatal-warnings
|
||||||
- rpm -i ./*.rpm
|
- rpm -i ./*.rpm
|
||||||
- make installcheck
|
- make installcheck
|
||||||
|
|
||||||
|
|
@ -88,7 +94,9 @@ build_fedora_package:
|
||||||
- ./ci/printenv.sh
|
- ./ci/printenv.sh
|
||||||
- ./configure || (cat config.log; exit 1)
|
- ./configure || (cat config.log; exit 1)
|
||||||
- make dist
|
- make dist
|
||||||
- ./platform/rpm/mkrpm.sh --enable-fatal-warnings
|
- >
|
||||||
|
MAKEFLAGS="$MAKEFLAGS -Orecurse" ./platform/rpm/mkrpm.sh
|
||||||
|
--enable-fatal-warnings
|
||||||
- rpm -i ./*.rpm
|
- rpm -i ./*.rpm
|
||||||
- make installcheck
|
- make installcheck
|
||||||
|
|
||||||
|
|
@ -106,7 +114,7 @@ build_fedora_package:
|
||||||
# - >
|
# - >
|
||||||
# ./configure --prefix=/usr
|
# ./configure --prefix=/usr
|
||||||
# || (cat config.log; exit 1)
|
# || (cat config.log; exit 1)
|
||||||
# - make
|
# - make -j "$(nproc)" -Orecurse
|
||||||
# - make install-strip
|
# - make install-strip
|
||||||
# - make installcheck
|
# - make installcheck
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue