svn commit: r1937499 - in httpd/httpd/trunk: .github/workflows test

[jo...@apache.org]

Author: jorton
Date: Thu Aug 27 06:31:33 2026
New Revision: 1937499

Log:
CI: Actually set MFLAGS, so builds are not serial.

MARGS is read by nothing.

* .github/workflows/linux.yml: Drop MARGS.  Default MFLAGS to the
  runner's CPU count, unless the matrix entry sets it.

* test/README.ci: Update the MFLAGS description.

Co-Authored-By: Claude Opus 5 (1M context) <no...@anthropic.com>
GitHub: PR #717

Modified:
   httpd/httpd/trunk/.github/workflows/linux.yml
   httpd/httpd/trunk/test/README.ci

Modified: httpd/httpd/trunk/.github/workflows/linux.yml
==============================================================================
--- httpd/httpd/trunk/.github/workflows/linux.yml	Thu Aug 27 06:31:26 2026	(r1937498)
+++ httpd/httpd/trunk/.github/workflows/linux.yml	Thu Aug 27 06:31:33 2026	(r1937499)
@@ -26,7 +26,6 @@ permissions:
   contents: read
 
 env:
-  MARGS: "-j2"
   CFLAGS: "-g"
   # This will need updating as the ubuntu-latest image changes:
   PHP_FPM: "/usr/sbin/php-fpm8.3"
@@ -342,6 +341,10 @@ jobs:
       run: |
         echo "${{ matrix.env }}" >> $GITHUB_ENV
         echo "IMAGEOS=$ImageOS" >> $GITHUB_ENV
+        # The scripts run "make $MFLAGS"; default it to the number of
+        # CPUs the runner has, unless the matrix entry set it already
+        # (the ap_expr job sets it empty on purpose).
+        grep -q '^MFLAGS=' $GITHUB_ENV || echo "MFLAGS=-j`nproc`" >> $GITHUB_ENV
         echo JOBID=`echo "OS=$ImageOS ${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}" \
            | md5sum - | sed 's/ .*//'` >> $GITHUB_ENV
     - name: apt refresh

Modified: httpd/httpd/trunk/test/README.ci
==============================================================================
--- httpd/httpd/trunk/test/README.ci	Thu Aug 27 06:31:26 2026	(r1937498)
+++ httpd/httpd/trunk/test/README.ci	Thu Aug 27 06:31:33 2026	(r1937499)
@@ -22,7 +22,10 @@ The CI scripts use the following environ
 
 * BUILDCONFIG - arguments to pass when running httpd's ./buildconf script
 
-* MFLAGS - arguments to pass when running "make" for httpd.
+* MFLAGS - arguments to pass when running "make", both for httpd and
+  for any dependency built from source.  The Linux workflow defaults
+  this to "-j<number of CPUs>"; a matrix entry can override it, e.g.
+  setting it empty to force a serial build.
 
 * SKIP_TESTING - if set, no testing is done at all