diff --git a/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml b/.gitlab/ci/jobs/alpine-3-gcc-dedicated.yml index 4eda844ddd3189148fa2e89fcceb0732d9ef070b..e09591ac1210b54bc1b41833af098bb38c4a803a 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 11d1ca219fcd6f5c745fd5dfeb8f79a9284c9653..5ad2ccd1d8c51aeb263f6e7487ac4a8fbb60859f 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 a914327abb957f8e3542285581cd73d21b8cbd68..4f4152c7630009d3a90676038159ec6c154960eb 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 6b0171862e8b64ed3d00bc007347a8d93896881d..1862196b948b1105c886f4f3f591e78269700056 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 237342c6ff298093d55b84848f85c4d812674ffc..bbc62d99b142a0fbec71b4adc02063f4dd969239 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 21fde253c78115f601957b81151f485b87cef274..e301b5acbc602f6c8e0314bc1fed8559f4e2e3c4 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 7389bbc37929340e5aa2233109493147140218ae..abfc86e61d4512ae3ee165ef83985ae1ed92504a 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 e794c26cfe574d71bd03ec84ae4c8878fbb165e1..a97ba9a3537413f4119a458c03f6b8b877e4efc8 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 6a0ddc6125b7f745b7b791f163075dc6b59ad02f..6949a55e8fd4b5c91d858d41d7567fdbe5bc93b1 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 9e871c2c88c597075c8eaebb12cb7636f0fef64e..85779dd5911ac5cf397dfb368aae6181528f9037 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 4ee5e5b78955cddbf16c4dafa946a61b5627c2ac..4ef5cc57afe03a7ec22c3b367cf7d275e03fcb06 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 ccb69db9baef8b8546ab633ed70cbac7ce08466d..c1aed5d1ea28f6c3c2b2c82f6337553cea70d0c1 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 9dedf58360f1cef6acefe13d98e552149bcfd11e..b92eae29d51a0d26671305d4c7ca5638524528ac 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 cac42f752715e145e6647189f3703f9d06b8cc74..22c2d05631a0e3f2327559fa685d2a5609a5925b 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"