CI: Make build logs more readable

If make fails in a multi-process invocation, the log is pretty much
unreadable.  To make it readable, build as much as can be built without
failing.  Then run a single-process make again.  If we succeeded
previously, this should be a no-op.  If not, this run will stop at the
first error, which should be more readable, and will only print the few
lines we're interested in.

This has some side effects:  Now we build as much as we can, instead of
failing as early as possible; this may make CI a bit slower.  However,
it also has the benefit that you see _all_ the error messages that could
be given, instead of needing to fix the first error to see the next and
so on.

Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2023-04-05 21:50:28 +02:00 committed by Iker Pedrosa
parent 075ed522be
commit 97f79e3b27
5 changed files with 11 additions and 5 deletions

View File

@ -32,7 +32,10 @@ jobs:
- name: Build shadow-utils - name: Build shadow-utils
run: | run: |
PROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN) PROCESSORS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
make -j$PROCESSORS make -kj$PROCESSORS || true
- name: Check build errors
run: make
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v2

View File

@ -36,7 +36,7 @@ addons:
notification_email: christian.brauner@ubuntu.com,serge@hallyn.com notification_email: christian.brauner@ubuntu.com,serge@hallyn.com
build_command_prepend: "./autogen.sh --without-selinux --disable-man" build_command_prepend: "./autogen.sh --without-selinux --disable-man"
build_command: "make -j4" build_command: "make -kj4 || make"
branch_pattern: master branch_pattern: master
script: script:

View File

@ -9,7 +9,8 @@ COPY ./ /usr/local/src/shadow/
WORKDIR /usr/local/src/shadow/ WORKDIR /usr/local/src/shadow/
RUN ./autogen.sh --without-selinux --disable-man --disable-nls --with-yescrypt RUN ./autogen.sh --without-selinux --disable-man --disable-nls --with-yescrypt
RUN make -j4 RUN make -kj4 || true
RUN make
RUN make install RUN make install
FROM scratch AS export FROM scratch AS export

View File

@ -16,7 +16,8 @@ COPY ./ /usr/local/src/shadow/
WORKDIR /usr/local/src/shadow/ WORKDIR /usr/local/src/shadow/
RUN ./autogen.sh --without-selinux --enable-man --with-yescrypt RUN ./autogen.sh --without-selinux --enable-man --with-yescrypt
RUN make -j4 RUN make -kj4 || true
RUN make
RUN make install RUN make install
FROM scratch AS export FROM scratch AS export

View File

@ -12,7 +12,8 @@ RUN ./autogen.sh --enable-shadowgrp --enable-man --with-audit \
--with-sha-crypt --with-bcrypt --with-yescrypt --with-selinux \ --with-sha-crypt --with-bcrypt --with-yescrypt --with-selinux \
--without-libcrack --without-libpam --enable-shared \ --without-libcrack --without-libpam --enable-shared \
--with-group-name-max-length=32 --with-group-name-max-length=32
RUN make -j4 RUN make -kj4 || true
RUN make
RUN make install RUN make install
FROM scratch AS export FROM scratch AS export