From 9880643df1fa04e1f2b9ca06327a2ff7884b4f8d Mon Sep 17 00:00:00 2001 From: Eidolon <furyhunter600@gmail.com> Date: Sat, 15 Mar 2025 12:29:13 -0500 Subject: [PATCH] Reduce distracting logging in CI --- .gitlab/ci/jobs/alpine-3-gcc-dedicated.yml | 3 ++- .gitlab/ci/jobs/alpine-3-gcc.yml | 3 ++- .gitlab/ci/jobs/batocera-arm64.yml | 3 ++- .gitlab/ci/jobs/debian-oldstable-amd64.yml | 3 ++- .gitlab/ci/jobs/debian-oldstable-arm64.yml | 3 ++- .gitlab/ci/jobs/debian-stable-amd64.yml | 3 ++- .gitlab/ci/jobs/debian-stable-arm64.yml | 3 ++- .gitlab/ci/jobs/debian-stable-clang-amd64.yml | 3 ++- .gitlab/ci/jobs/debian-stable-i386.yml | 3 ++- .gitlab/ci/jobs/debian-testing-gcc-amd64.yml | 3 ++- .gitlab/ci/jobs/macos-arm64.yml | 7 ++++--- .gitlab/ci/jobs/macos-x86_64.yml | 5 +++-- .gitlab/ci/jobs/windows-x64.yml | 3 ++- .gitlab/ci/jobs/windows-x86.yml | 3 ++- 14 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml b/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml index 4eda844dd..e09591ac1 100644 --- a/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml +++ b/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml @@ -33,6 +33,7 @@ Alpine 3 GCC Dedicated: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_EXECINFO=NO \ -DSRB2_CONFIG_DEDICATED=ON @@ -43,7 +44,7 @@ Alpine 3 GCC Dedicated: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose + - cmake --build build.cmake --parallel 1 - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml index 11d1ca219..5ad2ccd1d 100644 --- a/.gitlab/ci/jobs/alpine-3-gcc.yml +++ b/.gitlab/ci/jobs/alpine-3-gcc.yml @@ -114,6 +114,7 @@ Alpine 3 GCC: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_EXECINFO=NO - | @@ -123,7 +124,7 @@ Alpine 3 GCC: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml index a914327ab..4f4152c76 100644 --- a/.gitlab/ci/jobs/batocera-arm64.yml +++ b/.gitlab/ci/jobs/batocera-arm64.yml @@ -39,6 +39,7 @@ batocera:arm64: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON - | @@ -48,7 +49,7 @@ batocera:arm64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml index 6b0171862..1862196b9 100644 --- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml +++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml @@ -40,6 +40,7 @@ Debian oldstable:amd64: cmake \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3 -g -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g -DNDEBUG" -DSRB2_CONFIG_DEV_BUILD=ON \ @@ -52,7 +53,7 @@ Debian oldstable:amd64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml index 237342c6f..bbc62d99b 100644 --- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml +++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml @@ -40,6 +40,7 @@ Debian oldstable:arm64: cmake \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3 -g -DNDEBUG" \ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g -DNDEBUG" -DSRB2_CONFIG_DEV_BUILD=ON \ @@ -53,7 +54,7 @@ Debian oldstable:arm64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml index 21fde253c..e301b5acb 100644 --- a/.gitlab/ci/jobs/debian-stable-amd64.yml +++ b/.gitlab/ci/jobs/debian-stable-amd64.yml @@ -44,6 +44,7 @@ Debian stable:amd64: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF - | # cmake @@ -52,7 +53,7 @@ Debian stable:amd64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml index 7389bbc37..abfc86e61 100644 --- a/.gitlab/ci/jobs/debian-stable-arm64.yml +++ b/.gitlab/ci/jobs/debian-stable-arm64.yml @@ -45,6 +45,7 @@ Debian stable:arm64: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON - | @@ -54,7 +55,7 @@ Debian stable:arm64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml index e794c26cf..a97ba9a35 100644 --- a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml +++ b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml @@ -45,6 +45,7 @@ Debian stable Clang: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \ @@ -56,7 +57,7 @@ Debian stable Clang: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml index 6a0ddc612..6949a55e8 100644 --- a/.gitlab/ci/jobs/debian-stable-i386.yml +++ b/.gitlab/ci/jobs/debian-stable-i386.yml @@ -45,6 +45,7 @@ Debian stable:i386: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF - | # cmake @@ -53,7 +54,7 @@ Debian stable:i386: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml index 9e871c2c8..85779dd59 100644 --- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml +++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml @@ -45,6 +45,7 @@ Debian testing GCC: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF - | # cmake @@ -53,7 +54,7 @@ Debian testing GCC: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml index 4ee5e5b78..4ef5cc57a 100644 --- a/.gitlab/ci/jobs/macos-arm64.yml +++ b/.gitlab/ci/jobs/macos-arm64.yml @@ -65,6 +65,7 @@ osxcross arm64: --preset ninja-debug \ -B build.arm64 \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \ -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" \ @@ -82,7 +83,7 @@ osxcross arm64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.arm64 --parallel 1 --verbose -- --keep-going + - cmake --build build.arm64 --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" @@ -91,7 +92,7 @@ osxcross arm64: # copy config.h echo -e "\e[0Ksection_start:`date +%s`:copy[collapsed=false]\r\e[0KCopying config.h" - mkdir --parents --verbose build.arm64/dist - - cp --reflink=auto --sparse=always --verbose build.arm64/src/config.h build.arm64/dist/arm64.h + - cp --reflink=auto --sparse=always build.arm64/src/config.h build.arm64/dist/arm64.h - | # make - echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" \ No newline at end of file + echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml index ccb69db9b..c1aed5d1e 100644 --- a/.gitlab/ci/jobs/macos-x86_64.yml +++ b/.gitlab/ci/jobs/macos-x86_64.yml @@ -65,6 +65,7 @@ osxcross x86_64: --preset ninja-debug \ -B build.x86_64 \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DCPM_USE_LOCAL_PACKAGES:BOOL=ON \ -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" \ @@ -81,7 +82,7 @@ osxcross x86_64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.x86_64 --parallel 1 --verbose -- --keep-going + - cmake --build build.x86_64 --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" @@ -93,4 +94,4 @@ osxcross x86_64: - cp --reflink=auto --sparse=always --verbose build.x86_64/src/config.h build.x86_64/dist/x86_64.h - | # make - echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" \ No newline at end of file + echo -e "\e[0Ksection_end:`date +%s`:copy\r\e[0K" diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml index 9dedf5836..b92eae29d 100644 --- a/.gitlab/ci/jobs/windows-x64.yml +++ b/.gitlab/ci/jobs/windows-x64.yml @@ -76,6 +76,7 @@ Windows x64: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF \ @@ -89,7 +90,7 @@ Windows x64: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml index cac42f752..22c2d0563 100644 --- a/.gitlab/ci/jobs/windows-x86.yml +++ b/.gitlab/ci/jobs/windows-x86.yml @@ -74,6 +74,7 @@ Windows x86: --preset ninja-debug \ -B build.cmake \ -G "Unix Makefiles" \ + -DCMAKE_COLOR_DIAGNOSTICS=OFF \ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake \ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \ -DSRB2_CONFIG_ENABLE_DISCORDRPC=OFF \ @@ -87,7 +88,7 @@ Windows x86: - - | # make echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2" - - cmake --build build.cmake --parallel 1 --verbose -- --keep-going + - cmake --build build.cmake --parallel 1 -- --keep-going - | # make echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K" -- GitLab