From d7fd5bc9020117e92cf7426715b6a9f77cfac641 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 1 Jan 2026 16:34:16 +0100 Subject: [PATCH] .github: ensure regression tests do not run in parallel At least the sysvpart.sh regression test cannot run in parallel yet with other tests (probably runparts.sh), so we must ensure the tests never run in parallel, in particular at release. Signed-off-by: Joachim Wiberg --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/coverity.yml | 4 ++-- .github/workflows/release.yml | 8 +++----- .github/workflows/weekly.yml | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 729a02ea..460d378a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,23 +40,23 @@ jobs: wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz tar xf libuev-2.4.1.tar.xz tar xf libite-2.6.2.tar.gz - (cd libuev-2.4.1 && ./configure && make && sudo make install-strip) - (cd libite-2.6.2 && ./configure && make && sudo make install-strip) + (cd libuev-2.4.1 && ./configure && make -j9 && sudo make install-strip) + (cd libite-2.6.2 && ./configure && make -j9 && sudo make install-strip) sudo ldconfig - uses: actions/checkout@v4 - name: Static Finit run: | ./autogen.sh ./configure --prefix= --enable-static - make -j3 V=1 + make -j9 V=1 - name: Regular Finit run: | ./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc --localstatedir=/var \ --enable-x11-common-plugin --enable-testserv-plugin --with-watchdog \ --with-keventd --with-libsystemd \ CFLAGS="-fsanitize=address -ggdb" - make -j3 clean - make -j3 V=1 + make -j9 clean + make -j9 V=1 - name: Install to /tmp run: | DESTDIR=/tmp make install-strip @@ -78,7 +78,7 @@ jobs: sudo sysctl kernel.apparmor_restrict_unprivileged_userns=0 - name: Run Unit Tests run: | - make check || (cat test/test-suite.log; false) + make -j1 check || (cat test/test-suite.log; false) - name: Upload Test Results if: always() uses: actions/upload-artifact@v4 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 12dd8776..6b4add0b 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -60,8 +60,8 @@ jobs: wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz tar xf libuev-2.4.1.tar.xz tar xf libite-2.6.2.tar.gz - (cd libuev-2.4.1 && ./configure && make && sudo make install-strip) - (cd libite-2.6.2 && ./configure && make && sudo make install-strip) + (cd libuev-2.4.1 && ./configure && make -j9 && sudo make install-strip) + (cd libite-2.6.2 && ./configure && make -j9 && sudo make install-strip) sudo ldconfig - name: Configure run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f90c4b22..1f740e24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,6 @@ jobs: name: Build and upload release tarball if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest - env: - MAKEFLAGS: -j3 steps: - uses: actions/checkout@v4 - name: Installing dependencies ... @@ -25,8 +23,8 @@ jobs: wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz tar xf libuev-2.4.1.tar.xz tar xf libite-2.6.2.tar.gz - (cd libuev-2.4.1 && ./configure && make && sudo make install-strip) - (cd libite-2.6.2 && ./configure && make && sudo make install-strip) + (cd libuev-2.4.1 && ./configure && make -j9 && sudo make install-strip) + (cd libite-2.6.2 && ./configure && make -j9 && sudo make install-strip) sudo ldconfig - name: Setting release variables ... id: build @@ -60,7 +58,7 @@ jobs: ver=$(./configure --version | head -1 | awk '{print $NF}') dir=finit-$ver/_build/sub - make release || (cat $dir/test/test-suite.log; false) + make -j1 release || (cat $dir/test/test-suite.log; false) ls -lF ../ mkdir -p artifacts/ mv ../*.tar.* artifacts/ diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 4fe7e6cd..56991c2f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -39,8 +39,8 @@ jobs: wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz tar xf libuev-2.4.1.tar.xz tar xf libite-2.6.2.tar.gz - (cd libuev-2.4.1 && ./configure && make && sudo make install-strip) - (cd libite-2.6.2 && ./configure && make && sudo make install-strip) + (cd libuev-2.4.1 && ./configure && make -j9 && sudo make install-strip) + (cd libite-2.6.2 && ./configure && make -j9 && sudo make install-strip) sudo ldconfig - uses: actions/checkout@v4 - name: Base run