0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure to exit with the correct status.

Browse source
This commit is contained in:
pentarctagon 2020-01-03 08:57:59 -06:00 • committed by Pentarctagon
parent 392f84afff
commit d1f2d9add2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/travis/steps/script.sh
View file

@ -41,14 +41,17 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
fi fi
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:PlatformToolset=v141 -p:Configuration=$OPT" powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:PlatformToolset=v141 -p:Configuration=$OPT"
if [ "$OPT" == "Release" ]; then BUILD_RET=$?
if [ "$OPT" == "Release" ] && [ "$BUILD_RET" == "0" ]; then
./run_wml_tests -g -v -c -t "$WML_TEST_TIME" ./run_wml_tests -g -v -c -t "$WML_TEST_TIME"
else
exit $BUILD_RET
fi fi
else else
# additional permissions required due to flatpak's use of bubblewrap # additional permissions required due to flatpak's use of bubblewrap
docker run --cap-add=ALL --privileged \ docker run --cap-add=ALL --privileged \
--volume "$HOME"/build-cache:/home/wesnoth-travis/build \ --volume "$HOME"/build-cache:/home/wesnoth-travis/build \
--volume "$HOME"/flatpak-cache:/home/wesnoth-travis/flatpak-cache \ --volume "$HOME"/flatpak-cache:/home/wesnoth-travis/flatpak-cache \
--volume "$HOME"/.ccache:/root/.ccache \ --volume "$HOME"/.ccache:/root/.ccache \
--tty wesnoth-repo:"$LTS"-"$BRANCH" \ --tty wesnoth-repo:"$LTS"-"$BRANCH" \
unbuffer ./utils/travis/docker_run.sh "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE" "$LTS" unbuffer ./utils/travis/docker_run.sh "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE" "$LTS"