diff options
| author | Robert Adam <dev@robert-adam.de> | 2020-04-04 17:58:36 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2020-04-04 17:58:36 +0300 |
| commit | 077338d823d32bff587700fc3027c69228ea0d8a (patch) | |
| tree | 79184e07936241ebb23e071700f8b9417b868b29 /scripts | |
| parent | 8271da3a4160e541e819adae99b5f1de331c49f1 (diff) | |
scripts: Make sure CI reflects actual build status (see #3956)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/azure-pipelines/build_macos.bash | 4 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/scripts/azure-pipelines/build_macos.bash b/scripts/azure-pipelines/build_macos.bash index 4e923d21c..db9c38084 100755 --- a/scripts/azure-pipelines/build_macos.bash +++ b/scripts/azure-pipelines/build_macos.bash @@ -11,4 +11,6 @@ export PATH=$PATH:/usr/local/opt/qt5/bin:/usr/local/bin export MUMBLE_PREFIX=/usr/local export MUMBLE_ICE_PREFIX=/usr/local/opt/ice -qmake -recursive CONFIG+="release tests warnings-as-errors" && make -j $(sysctl -n hw.ncpu) && make check +qmake -recursive CONFIG+="release tests warnings-as-errors" +make -j $(sysctl -n hw.ncpu) +make check diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index 7c0d6f917..f2bc379c0 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -17,7 +17,9 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi - qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive && make -j2 && make check + qmake-qt4 CONFIG+="release tests g15-emulator qt4-legacy-compat ${EXTRA_CONFIG}" -recursive + make -j2 + make check elif [ "${MUMBLE_QT}" == "qt5" ] && [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then EXTRA_CONFIG=PREFIX=/usr if [ "${MUMBLE_NO_PCH}" == "1" ]; then @@ -33,7 +35,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then # Run the SonarQube analysis sonar-scanner else - make -j2 && make check + make -j2 + make check if [ "${MASTER_BRANCH}" = "1" ]; then # The next few lines should really be done by "make install"; https://github.com/mumble-voip/mumble/issues/1029 @@ -86,7 +89,9 @@ elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then export PATH=$PATH:/usr/local/opt/qt5/bin:/usr/local/bin export MUMBLE_PREFIX=/usr/local export MUMBLE_ICE_PREFIX=/usr/local/opt/ice - qmake CONFIG+="release tests warnings-as-errors" && make -j2 && make check + qmake CONFIG+="release tests warnings-as-errors" + make -j2 + make check ./macx/scripts/osxdist.py --no-compat-warning else exit 1 |