From 45a5246099a0057ac8be79a2b05a3a0f76017241 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 19 Mar 2025 15:46:32 -0400
Subject: [PATCH] Ported from RingRagers for GitLab CI:
Reduce distracting logging in CI
---
.gitlab/ci/jobs/alpine-3-gcc-makefile.yml | 2 +-
.gitlab/ci/jobs/alpine-3-gcc.yml | 12 +++++++++--
.gitlab/ci/jobs/batocera-arm64.yml | 12 +++++++++--
.gitlab/ci/jobs/debian-oldstable-amd64.yml | 11 ++++++++--
.gitlab/ci/jobs/debian-oldstable-arm64.yml | 12 +++++++++--
.gitlab/ci/jobs/debian-stable-amd64.yml | 11 ++++++++--
.gitlab/ci/jobs/debian-stable-arm64.yml | 12 +++++++++--
.gitlab/ci/jobs/debian-stable-clang-amd64.yml | 14 +++++++++++--
.gitlab/ci/jobs/debian-stable-i386.yml | 11 ++++++++--
.gitlab/ci/jobs/debian-testing-gcc-amd64.yml | 11 ++++++++--
.gitlab/ci/jobs/macos-arm64.yml | 21 +++++++++++++++----
.gitlab/ci/jobs/macos-x86_64.yml | 20 ++++++++++++++----
.gitlab/ci/jobs/windows-x64.yml | 13 ++++++++++--
.gitlab/ci/jobs/windows-x86.yml | 13 ++++++++++--
14 files changed, 144 insertions(+), 31 deletions(-)
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 3a17e09333..13bcea0702 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -101,7 +101,7 @@ Alpine 3 GCC Makefile:
- - |
# apk_development
echo -e "\e[0Ksection_start:`date +%s`:apk_development[collapsed=true]\r\e[0KInstalling development packages"
- - apk add cmake musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev elfutils-dev
+ - apk add musl-dev sdl2_mixer-dev libpng-dev curl-dev libgme-dev libopenmpt-dev miniupnpc-dev elfutils-dev
- |
# apk_development
echo -e "\e[0Ksection_end:`date +%s`:apk_development\r\e[0K"
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 3456a70709..5d828ce58b 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -109,7 +109,15 @@ Alpine 3 GCC:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_EXECINFO=NO -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_EXECINFO=NO \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -117,7 +125,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 7acba8c796..5f928ab506 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -34,7 +34,15 @@ batocera:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -42,7 +50,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 a59dd43d4f..3aaf30698f 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -36,7 +36,14 @@ Debian oldstable:amd64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -44,7 +51,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 89fe8630eb..96db9f486e 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -36,7 +36,15 @@ Debian oldstable:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -44,7 +52,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 481e6d1b83..da3b3a4ad8 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64.yml
@@ -39,7 +39,14 @@ Debian stable:amd64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -47,7 +54,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 970001fd5c..1f929a06be 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64.yml
@@ -40,7 +40,15 @@ Debian stable:arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +56,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 02879f4f55..fb363c7aec 100644
--- a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
@@ -40,7 +40,17 @@ Debian stable Clang:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_USE_LIBGME:BOOL=OFF -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -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 \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_USE_LIBGME:BOOL=OFF \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +58,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 563ff9aca4..f27c91533e 100644
--- a/.gitlab/ci/jobs/debian-stable-i386.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386.yml
@@ -40,7 +40,14 @@ Debian stable:i386:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +55,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 cd3ac33a25..9d7020e4c6 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
@@ -40,7 +40,14 @@ Debian testing GCC:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DSRB2_CONFIG_USE_GME:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=ON
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -48,7 +55,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 8cb77d1b8d..8e974c4f7d 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -21,8 +21,8 @@ osxcross arm64:
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
- - osxcross-macports install --arm64 libopenmpt || osxcross-macports install --verbose --arm64 libopenmpt || true
- - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true
+ - osxcross-macports install --arm64 libopenmpt || osxcross-macports install --verbose --arm64 libopenmpt || true
+ - osxcross-macports install --arm64 wavpack || osxcross-macports install --verbose --arm64 wavpack || true
- osxcross-macports install --arm64 libxmp opusfile || osxcross-macports install --verbose --arm64 libxmp opusfile
- osxcross-macports install --static --arm64 libsdl2_mixer || osxcross-macports install --verbose --static --arm64 libsdl2_mixer || true
- osxcross-macports install --static --arm64 miniupnpc curl libpng || osxcross-macports install --verbose --static --arm64 miniupnpc curl libpng
@@ -33,7 +33,20 @@ osxcross arm64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.arm64 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON -G "Unix Makefiles"
+ - |
+ cmake \
+ -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" \
+ -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" \
+ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF \
+ -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID \
+ -DSRB2_CONFIG_FORCE_NO_MS_BITFIELDS:BOOL=ON
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -41,7 +54,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"
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index a7e510fb57..e90d28b511 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -21,8 +21,8 @@ osxcross x86_64:
- - |
# apt_development
echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
- - osxcross-macports install libopenmpt || osxcross-macports install --verbose libopenmpt || true
- - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true
+ - osxcross-macports install libopenmpt || osxcross-macports install --verbose libopenmpt || true
+ - osxcross-macports install wavpack || osxcross-macports install --verbose wavpack || true
- osxcross-macports install libxmp opusfile || osxcross-macports install --verbose libxmp opusfile
- osxcross-macports install --static libsdl2_mixer || osxcross-macports install --verbose --static libsdl2_mixer || true
- osxcross-macports install --static miniupnpc curl libpng || osxcross-macports install --verbose --static miniupnpc curl libpng
@@ -33,7 +33,19 @@ osxcross x86_64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.x86_64 -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DCPM_USE_LOCAL_PACKAGES:BOOL=ON -DOPENMPT_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/include" -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON -DSRB2_CONFIG_USE_GME:BOOL=OFF -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID -G "Unix Makefiles"
+ - |
+ cmake \
+ -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" \
+ -DSDL2_INCLUDE_DIR:PATH="/osxcross/macports/pkgs/opt/local/lib" \
+ -DSRB2_CONFIG_ENABLE_TESTS:BOOL=OFF \
+ -DSRB2_CONFIG_SYSTEM_LIBRARIES:BOOL=ON \
+ -DSRB2_CONFIG_USE_GME:BOOL=OFF \
+ -DSRB2_SDL2_EXE_NAME=srb2_$CI_PIPELINE_ID
- |
# make
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
@@ -41,7 +53,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"
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index c03bf8f32e..6db0de9a76 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -69,7 +69,16 @@ Windows x64:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \
+ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \
+ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -77,7 +86,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 91bcf8467c..0a1b24e181 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -65,7 +65,16 @@ Windows x86:
- - |
# cmake
echo -e "\e[0Ksection_start:`date +%s`:cmake[collapsed=false]\r\e[0KBuilding Makefiles"
- - cmake -B build.cmake -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF -DSRB2_CONFIG_ERRORMODE=ON -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake -G "Unix Makefiles"
+ - |
+ cmake \
+ -B build.cmake \
+ -G "Unix Makefiles" \
+ -DCMAKE_COLOR_DIAGNOSTICS=OFF \
+ -DSRB2_CONFIG_ENABLE_WEBM_MOVIES=OFF \
+ -DSRB2_CONFIG_ERRORMODE=ON \
+ -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \
+ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \
+ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/toolchains/mingw.cmake
- |
# cmake
echo -e "\e[0Ksection_end:`date +%s`:cmake\r\e[0K"
@@ -73,7 +82,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