From b14dfb25eb26a17bd6f2445f8fba4bbd83b097b0 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Fri, 7 Feb 2020 09:05:22 -0600 Subject: [PATCH] Fix the return code from the mingw job. The job should take its final return code from the scons job if it failed, not the sftp attempt. --- utils/travis/docker_run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/travis/docker_run.sh b/utils/travis/docker_run.sh index d1fc0c6d40f..455dae7d109 100755 --- a/utils/travis/docker_run.sh +++ b/utils/travis/docker_run.sh @@ -74,10 +74,13 @@ elif [ "$LTS" == "mingw" ]; then cxx_std=$CXXSTD opt="$OPT" strict="$STRICT" \ nls=false enable_lto="$LTO" sanitize="$SAN" jobs=2 --debug=time \ arch=x86-64 prefix=/windows/mingw64 gtkdir=/windows/mingw64 host=x86_64-w64-mingw32 + BUILD_RET=$? if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./utils/travis/sftp fi + + exit $BUILD_RET=$? elif [ "$LTS" == "steamrt" ]; then scons ctool=$CC cxxtool=$CXX boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt \ cxx_std=$CXXSTD opt="$OPT" strict="$STRICT" nls=false enable_lto="$LTO" sanitize="$SAN" jobs=2 --debug=time \