From: Florian Forster <octo@collectd.org>
Date: Fri, 24 Nov 2023 14:53:44 +0000 (+0100)
Subject: Build workflow: use all available CPUs.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88d8495f6d86cb65538bce6794d5d0aeda527333;p=thirdparty%2Fcollectd.git

Build workflow: use all available CPUs.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31fafa893..3c570e8e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,6 @@ jobs:
           - fedora38_x86_64
         config_flags: ['']
     env:
-      MAKEFLAGS: "-j2 -sk"
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
       # this env var picked up by valgrind during make check phase
       VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
@@ -51,9 +50,9 @@ jobs:
     - name: Run configure script
       run: ./configure $CONFIGURE_FLAGS
     - name: Build collectd
-      run: make $MAKEFLAGS
+      run: make -j$(nproc) -sk
     - name: Run make check
-      run: make $MAKEFLAGS check
+      run: make -j$(nproc) -sk check
       continue-on-error: true
     - name: Dump test logs
       uses: actions/upload-artifact@v3
@@ -81,7 +80,6 @@ jobs:
             cppflags: "-fPIE -Wno-deprecated-declarations"
             config_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt --disable-xmms"
     env:
-      MAKEFLAGS: "-j2 -sk"
       CFLAGS: ${{ matrix.cflags }}
       CPPFLAGS: ${{ matrix.cppflags }}
       CONFIGURE_FLAGS: ${{ matrix.config_flags }}
@@ -96,9 +94,9 @@ jobs:
     - name: Run configure script
       run: ./configure $CONFIGURE_FLAGS
     - name: Build collectd
-      run: make $MAKEFLAGS
+      run: make -j$(nproc) -sk
     - name: Run make check
-      run: make $MAKEFLAGS check
+      run: make -j$(nproc) -sk check
       continue-on-error: true
     - name: Dump test logs
       uses: actions/upload-artifact@v3
diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 927d4f91e..9898b4e5d 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -18,7 +18,6 @@ jobs:
     runs-on: ubuntu-latest
     container: collectd/ci:bullseye_amd64
     env:
-      MAKEFLAGS: "-j$(nproc) -sk"
       # this env var picked up by valgrind during make check phase
       VALGRIND_OPTS: "--errors-for-leak-kinds=definite"
     steps: