From a3cae72faaf71d88d48cccdbd57586397be19afe Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 13 Feb 2024 16:54:33 +0100
Subject: [PATCH] share/containers/, .github/workflows/: Don't make(1) twice

It was being done so that the second one prints errors without races.
However, the same thing can be achieved by passing -Orecurse to make(1).

And this makes the logs even more readable, since there's no racy output
at all.

Fixes: 97f79e3b2715 ("CI: Make build logs more readable")
Link: <https://github.com/shadow-maint/shadow/pull/702>
Link: <https://github.com/nginx/unit/pull/1123>
Acked-by: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Andrew Clayton <a.clayton@nginx.com>
Cc: Konstantin Pavlov <thresh@nginx.com>
Cc: Dylan Arbour <https://github.com/arbourd>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 .github/workflows/static-code-analysis.yml | 5 +----
 share/containers/alpine.dockerfile         | 3 +--
 share/containers/debian.dockerfile         | 3 +--
 share/containers/fedora.dockerfile         | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml
index b9cfb4e9..59e4a16d 100644
--- a/.github/workflows/static-code-analysis.yml
+++ b/.github/workflows/static-code-analysis.yml
@@ -32,10 +32,7 @@ jobs:
     - name: Build shadow-utils
       run: |
         PROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
-        make -kj$PROCESSORS || true
-
-    - name: Check build errors
-      run: make
+        make -Orecurse -j$PROCESSORS
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
diff --git a/share/containers/alpine.dockerfile b/share/containers/alpine.dockerfile
index e1886e40..f6d9f11c 100644
--- a/share/containers/alpine.dockerfile
+++ b/share/containers/alpine.dockerfile
@@ -26,8 +26,7 @@ RUN ./autogen.sh \
 	--disable-man \
 	--disable-nls \
 	--with-yescrypt
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
diff --git a/share/containers/debian.dockerfile b/share/containers/debian.dockerfile
index 9a302967..408c6fa1 100644
--- a/share/containers/debian.dockerfile
+++ b/share/containers/debian.dockerfile
@@ -23,8 +23,7 @@ RUN ./autogen.sh \
 	--without-selinux \
 	--enable-man \
 	--with-yescrypt
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
diff --git a/share/containers/fedora.dockerfile b/share/containers/fedora.dockerfile
index 5ad9d418..93c6b220 100644
--- a/share/containers/fedora.dockerfile
+++ b/share/containers/fedora.dockerfile
@@ -25,8 +25,7 @@ RUN ./autogen.sh \
         --with-group-name-max-length=32 \
 	--enable-lastlog \
 	--enable-logind=no
-RUN make -kj4 || true
-RUN make
+RUN make -Orecurse -j4
 RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install