Skip to content

Commit

Permalink
share/containers/, .github/workflows/: Don't make(1) twice
Browse files Browse the repository at this point in the history
It was being done so that the second one prints errors without races.
However, the same thing can be done by passing -Orecurse to make(1).

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

Fixes: 97f79e3 ("CI: Make build logs more readable")
Link: <shadow-maint#702>
Link: <nginx/unit#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>
  • Loading branch information
alejandro-colomar committed Feb 13, 2024
1 parent 3e59e96 commit 76ac96d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/static-code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions share/containers/alpine.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ COPY ./ /usr/local/src/shadow/
WORKDIR /usr/local/src/shadow/

RUN ./autogen.sh --without-selinux --disable-man --disable-nls --with-yescrypt
RUN make -kj4 || true
RUN make
RUN make -Orecurse -j4
RUN make check
RUN make install

Expand Down
3 changes: 1 addition & 2 deletions share/containers/debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ COPY ./ /usr/local/src/shadow/
WORKDIR /usr/local/src/shadow/

RUN ./autogen.sh --without-selinux --enable-man --with-yescrypt
RUN make -kj4 || true
RUN make
RUN make -Orecurse -j4
RUN make check
RUN make install

Expand Down
3 changes: 1 addition & 2 deletions share/containers/fedora.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ RUN ./autogen.sh --enable-shadowgrp --enable-man --with-audit \
--with-sha-crypt --with-bcrypt --with-yescrypt --with-selinux \
--without-libpam --enable-shared --without-libbsd \
--with-group-name-max-length=32 --enable-lastlog --enable-logind=no
RUN make -kj4 || true
RUN make
RUN make -Orecurse -j4
RUN make check
RUN make install

Expand Down

0 comments on commit 76ac96d

Please sign in to comment.