From 0c838c14e99cab036387577de96a63f9a873dc5d Mon Sep 17 00:00:00 2001 From: pstef <3462925+pstef@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:36:48 +0000 Subject: [PATCH 1/2] Makefiles: don't print info unconditionally The point of making the default "semi-silent" (each target is printed, but not the entire invocation verbatim) was to factor out information about invocation to a one-time target (info) and not repeating it ever again. With V=1, the info target is silent, because each command invocation will be printed verbatim, which needs no herald. The undesired side effect of me introducing the info target and making it a dependency of the default all target is that info doesn't respect the --silent make option, so in this use case it was more noisy, not less. I believe the most elegant solution that satisfies all use cases is to stop printing info unconditionally, and instead list it explicitly in make invocations in CI, together with the all target. Then this info is kept available for inspection from logs, but it's not repeated on each invocation. The intention was to make the logs easier to read and scroll in search for new compiler warnings. --- Makefile | 2 +- Makefile.ctr | 2 +- Makefile.dos | 2 +- Makefile.miyoo | 2 +- Makefile.ngc | 2 +- Makefile.orbis | 2 +- Makefile.ps2 | 2 +- Makefile.psl1ght | 2 +- Makefile.retrofw | 2 +- Makefile.rs90 | 2 +- Makefile.vita | 2 +- Makefile.webos | 2 +- Makefile.wii | 2 +- Makefile.wiiu | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index ca736ddab3..9d68f555d7 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ ifneq ($(MOC_HEADERS),) RARCH_OBJ += $(MOC_OBJ) endif -all: info $(TARGET) config.mk +all: $(TARGET) config.mk define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.ctr b/Makefile.ctr index ad4093bc9c..5ac5102b92 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -274,7 +274,7 @@ endif .PHONY: $(BUILD) clean all -all: info $(TARGET) +all: $(TARGET) define INFO AR: $(AR) diff --git a/Makefile.dos b/Makefile.dos index 2f36430112..18f716e91d 100644 --- a/Makefile.dos +++ b/Makefile.dos @@ -207,7 +207,7 @@ DEPENDS := $(filter-out libretro_libnx.a,$(DEPENDS_TMP)) #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- -all: info $(OUTPUT) +all: $(OUTPUT) define INFO CC: $(CC) diff --git a/Makefile.miyoo b/Makefile.miyoo index 67c1b73d91..77cbfedd44 100644 --- a/Makefile.miyoo +++ b/Makefile.miyoo @@ -166,7 +166,7 @@ endif RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ)) -all: info $(TARGET) +all: $(TARGET) define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.ngc b/Makefile.ngc index c733120fbf..a82230c738 100644 --- a/Makefile.ngc +++ b/Makefile.ngc @@ -241,7 +241,7 @@ OBJOUT = -o LINKOUT = -o LINK = $(CXX) -all: info $(EXT_TARGET) +all: $(EXT_TARGET) define INFO CC: $(CC) diff --git a/Makefile.orbis b/Makefile.orbis index b598f715e0..b5bd2f9bf4 100644 --- a/Makefile.orbis +++ b/Makefile.orbis @@ -182,7 +182,7 @@ endif TARGETS := $(TARGET).self -all: info $(TARGETS) +all: $(TARGETS) define INFO CC: $(CC) diff --git a/Makefile.ps2 b/Makefile.ps2 index 1ffe0d1e95..ef5c905b8d 100644 --- a/Makefile.ps2 +++ b/Makefile.ps2 @@ -108,7 +108,7 @@ EE_INCS = $(INCDIR) EE_BIN = $(TARGET).elf EE_GPVAL = $(GPVAL) -all: info $(EE_BIN) +all: $(EE_BIN) define INFO EE_BIN: $(EE_BIN) diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 6350e07cb4..cbff2b32ff 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -130,7 +130,7 @@ ifneq ($(V),1) Q := @ endif -all: info $(SELF_TARGET) +all: $(SELF_TARGET) define INFO CXX: $(CXX) diff --git a/Makefile.retrofw b/Makefile.retrofw index fc0a2ddffa..d3ecb0a008 100644 --- a/Makefile.retrofw +++ b/Makefile.retrofw @@ -184,7 +184,7 @@ X-OD-NeedsDownscaling=true endef export DESKTOP_ENTRY -all: info $(TARGET) opk +all: $(TARGET) opk define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.rs90 b/Makefile.rs90 index 58492e5308..58323d3615 100644 --- a/Makefile.rs90 +++ b/Makefile.rs90 @@ -186,7 +186,7 @@ X-OD-NeedsDownscaling=true endef export DESKTOP_ENTRY -all: info $(TARGET) opk +all: $(TARGET) opk define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.vita b/Makefile.vita index ec94f0cbca..c4691300e6 100644 --- a/Makefile.vita +++ b/Makefile.vita @@ -201,7 +201,7 @@ TARGETS := $(TARGET).vpk DEPFLAGS = -MT $@ -MMD -MP -MF $*.Tdepend POSTCOMPILE = mv -f $*.Tdepend $*.depend -all: info $(TARGETS) +all: $(TARGETS) define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.webos b/Makefile.webos index 4ca35b420c..f774f23505 100644 --- a/Makefile.webos +++ b/Makefile.webos @@ -204,7 +204,7 @@ define APPINFO endef export APPINFO -all: info $(TARGET) ipk +all: $(TARGET) ipk define INFO ASFLAGS: $(ASFLAGS) diff --git a/Makefile.wii b/Makefile.wii index f25ebff1a7..193036f282 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -273,7 +273,7 @@ OBJOUT = -o LINKOUT = -o LINK = $(CXX) -all: info $(EXT_TARGET) +all: $(EXT_TARGET) define INFO CC: $(CC) diff --git a/Makefile.wiiu b/Makefile.wiiu index ee66630887..47552d31a7 100644 --- a/Makefile.wiiu +++ b/Makefile.wiiu @@ -302,7 +302,7 @@ endif DEPFLAGS = -MT $@ -MMD -MP -MF $(BUILD_DIR)/$*.depend -all: info $(TARGETS) +all: $(TARGETS) define INFO AR: $(AR) From 48f842f30733157d5338c1f9659cb3a7c98192a6 Mon Sep 17 00:00:00 2001 From: pstef <3462925+pstef@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:54:24 +0000 Subject: [PATCH 2/2] CI: use the info target These makefiles provide the info target that will print contents of each variable that is not printed (unless V=1, which is not the case here) on command invocation. Making this information available in the logs should help debugging, but it doesn't need to be printed on each command invocation. --- .github/workflows/3DS.yml | 2 +- .github/workflows/DOS-DJGPP.yml | 2 +- .github/workflows/GameCube.yml | 2 +- .github/workflows/Linux.yml | 2 +- .github/workflows/MSYS2.yml | 2 +- .github/workflows/Miyoo.yml | 2 +- .github/workflows/PS2.yml | 2 +- .github/workflows/PS3-PSL1GHT.yml | 2 +- .github/workflows/PS4-ORBIS.yml | 2 +- .github/workflows/PSVita.yml | 2 +- .github/workflows/RS90.yml | 2 +- .github/workflows/RetroFW.yml | 2 +- .github/workflows/Wii.yml | 2 +- .github/workflows/WiiU.yml | 2 +- .github/workflows/retroarch.yml | 2 +- .github/workflows/webOS.yml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/3DS.yml b/.github/workflows/3DS.yml index e1825e4b26..34aa1ac9be 100644 --- a/.github/workflows/3DS.yml +++ b/.github/workflows/3DS.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 clean - make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 HAVE_STATIC_DUMMY=1 + make -f Makefile.ctr -j$(getconf _NPROCESSORS_ONLN) USE_CTRULIB_2=1 HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" diff --git a/.github/workflows/DOS-DJGPP.yml b/.github/workflows/DOS-DJGPP.yml index 6f5595ce05..84086cd6cd 100644 --- a/.github/workflows/DOS-DJGPP.yml +++ b/.github/workflows/DOS-DJGPP.yml @@ -25,7 +25,7 @@ jobs: - name: Compile RA run: | make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 + make -f Makefile.dos -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug diff --git a/.github/workflows/GameCube.yml b/.github/workflows/GameCube.yml index 24823fcb91..75a27a8eba 100644 --- a/.github/workflows/GameCube.yml +++ b/.github/workflows/GameCube.yml @@ -25,7 +25,7 @@ jobs: - name: Compile RA run: | make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1 + make -f Makefile.ngc -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 7ce4b1965e..3b1a507612 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -j$(getconf _NPROCESSORS_ONLN) clean - make -j$(getconf _NPROCESSORS_ONLN) + make -j$(getconf _NPROCESSORS_ONLN) info all - name: Get short SHA id: slug diff --git a/.github/workflows/MSYS2.yml b/.github/workflows/MSYS2.yml index 3d0bb30415..5b2514eee9 100644 --- a/.github/workflows/MSYS2.yml +++ b/.github/workflows/MSYS2.yml @@ -59,7 +59,7 @@ jobs: run: | echo "Building RetroArch in ${{ matrix.sys }} environment" ./configure - make -j$(nproc) + make -j$(nproc) info all - name: Collect DLLs and binaries shell: msys2 {0} diff --git a/.github/workflows/Miyoo.yml b/.github/workflows/Miyoo.yml index de6018a50a..9977075dc8 100644 --- a/.github/workflows/Miyoo.yml +++ b/.github/workflows/Miyoo.yml @@ -25,7 +25,7 @@ jobs: - name: Compile RA run: | make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo clean - make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo + make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.miyoo info all - name: Get short SHA id: slug diff --git a/.github/workflows/PS2.yml b/.github/workflows/PS2.yml index 4e60d718f0..1d81d9daf4 100644 --- a/.github/workflows/PS2.yml +++ b/.github/workflows/PS2.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 release + make -f Makefile.ps2 -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info release - name: Get short SHA id: slug diff --git a/.github/workflows/PS3-PSL1GHT.yml b/.github/workflows/PS3-PSL1GHT.yml index f98b459454..5850e5e88d 100644 --- a/.github/workflows/PS3-PSL1GHT.yml +++ b/.github/workflows/PS3-PSL1GHT.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.psl1ght -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.psl1ght -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 + make -f Makefile.psl1ght -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug diff --git a/.github/workflows/PS4-ORBIS.yml b/.github/workflows/PS4-ORBIS.yml index 2296eed6d0..d382a38bc6 100644 --- a/.github/workflows/PS4-ORBIS.yml +++ b/.github/workflows/PS4-ORBIS.yml @@ -31,7 +31,7 @@ jobs: - name: Compile RA run: | export PATH=~/cli:$PATH # .net cli - make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 + make -f Makefile.orbis -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug diff --git a/.github/workflows/PSVita.yml b/.github/workflows/PSVita.yml index 87e5933e9e..1e26200c0f 100644 --- a/.github/workflows/PSVita.yml +++ b/.github/workflows/PSVita.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 HAVE_VITAGLES=1 + make -f Makefile.vita -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 HAVE_VITAGLES=1 info all - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" diff --git a/.github/workflows/RS90.yml b/.github/workflows/RS90.yml index 34332c5ce0..8c730d9598 100644 --- a/.github/workflows/RS90.yml +++ b/.github/workflows/RS90.yml @@ -25,7 +25,7 @@ jobs: - name: Compile RA run: | make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90 clean - make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90 + make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.rs90 info all - name: Get short SHA id: slug diff --git a/.github/workflows/RetroFW.yml b/.github/workflows/RetroFW.yml index cb57960e1d..f7ddae3678 100644 --- a/.github/workflows/RetroFW.yml +++ b/.github/workflows/RetroFW.yml @@ -25,7 +25,7 @@ jobs: - name: Compile RA run: | make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw clean - make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw + make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.retrofw info all - name: Get short SHA id: slug diff --git a/.github/workflows/Wii.yml b/.github/workflows/Wii.yml index f5f1e69d14..f56b0728b4 100644 --- a/.github/workflows/Wii.yml +++ b/.github/workflows/Wii.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1 + make -f Makefile.wii -j$(getconf _NPROCESSORS_ONLN) EXTERNAL_LIBOGC=1 GX_PTHREAD_LEGACY=0 HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" diff --git a/.github/workflows/WiiU.yml b/.github/workflows/WiiU.yml index 2a53051107..51650e4406 100644 --- a/.github/workflows/WiiU.yml +++ b/.github/workflows/WiiU.yml @@ -30,7 +30,7 @@ jobs: - name: Compile RA run: | make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) clean - make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 + make -f Makefile.wiiu -j$(getconf _NPROCESSORS_ONLN) HAVE_STATIC_DUMMY=1 info all - name: Get short SHA id: slug run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)" diff --git a/.github/workflows/retroarch.yml b/.github/workflows/retroarch.yml index 8847aa35e8..1ce2da4004 100644 --- a/.github/workflows/retroarch.yml +++ b/.github/workflows/retroarch.yml @@ -33,4 +33,4 @@ jobs: - name: Build Debug run: | make clean # making sure we don't have leftovers from previous build - make DEBUG=1 GL_DEBUG=1 C89_BUILD=1 + make DEBUG=1 GL_DEBUG=1 C89_BUILD=1 info all diff --git a/.github/workflows/webOS.yml b/.github/workflows/webOS.yml index 8eb8697949..adca736991 100644 --- a/.github/workflows/webOS.yml +++ b/.github/workflows/webOS.yml @@ -52,4 +52,4 @@ jobs: - name: Compile RA run: | . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup - make -f Makefile.webos ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN) + make -f Makefile.webos ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN) info all