2
0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-25 11:19:59 +01:00

ci: don't spew config.log when it's not needed, less verbosity

This commit is contained in:
Alibek Omarov 2023-01-14 10:06:32 +03:00
parent a09aa31b7a
commit 2705e77a4e
4 changed files with 12 additions and 7 deletions

View File

@ -14,9 +14,9 @@ build_engine()
cd "$CIRRUS_WORKING_DIR" || die cd "$CIRRUS_WORKING_DIR" || die
if [ "$APP" = "xashds" ]; then if [ "$APP" = "xashds" ]; then
./waf configure -T release -d --enable-fs-tests || die ./waf configure -T release -d --enable-fs-tests || die_configure
elif [ "$APP" = "xash3d-fwgs" ]; then elif [ "$APP" = "xash3d-fwgs" ]; then
./waf configure -T release --enable-stb --enable-utils --enable-gl4es --enable-gles1 --enable-gles2 --enable-fs-tests || die ./waf configure -T release --enable-stb --enable-utils --enable-gl4es --enable-gles1 --enable-gles2 --enable-fs-tests || die_configure
else else
die die
fi fi

View File

@ -50,9 +50,9 @@ build_engine()
fi fi
if [ "$1" = "dedicated" ]; then if [ "$1" = "dedicated" ]; then
./waf configure -T release -d $AMD64 --enable-fs-tests || die ./waf configure -T release -d $AMD64 --enable-fs-tests || die_configure
elif [ "$1" = "full" ]; then elif [ "$1" = "full" ]; then
./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils --enable-fs-tests || die ./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils --enable-fs-tests || die_confgure
else else
die die
fi fi

View File

@ -11,8 +11,8 @@ fi
# NOTE: to build with other version use --msvc_version during configuration # NOTE: to build with other version use --msvc_version during configuration
# NOTE: sometimes you may need to add WinSDK to %PATH% # NOTE: sometimes you may need to add WinSDK to %PATH%
./waf.bat configure -s "SDL2_VC" -T "release" --enable-utils --enable-fs-tests --prefix=`pwd` $AMD64 || die ./waf.bat configure -s "SDL2_VC" -T "release" --enable-utils --enable-fs-tests --prefix=`pwd` $AMD64 || die_configure
./waf.bat build -v || die ./waf.bat build || die
./waf.bat install || die ./waf.bat install || die
if [ "$ARCH" = "i386" ]; then if [ "$ARCH" = "i386" ]; then

View File

@ -1,9 +1,14 @@
die() die()
{ {
cat build/config.log
exit 1 exit 1
} }
die_configure()
{
cat build/config.log
die
}
if [ -n "$TRAVIS_BUILD_DIR" ]; then if [ -n "$TRAVIS_BUILD_DIR" ]; then
BUILDDIR=$TRAVIS_BUILD_DIR BUILDDIR=$TRAVIS_BUILD_DIR
elif [ -n "$GITHUB_WORKSPACE" ]; then elif [ -n "$GITHUB_WORKSPACE" ]; then