diff options
-rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 3 | ||||
-rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 3 | ||||
-rw-r--r-- | .ci/azure-pipelines/build_windows.bat | 4 | ||||
-rwxr-xr-x | .ci/travis-ci/script.bash | 7 |
4 files changed, 11 insertions, 6 deletions
diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index 7d4fd464d..cce70a515 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -18,7 +18,8 @@ VER=$(python scripts/mumble-version.py) cd $BUILD_BINARIESDIRECTORY # QSslDiffieHellmanParameters was introduced in Qt 5.8, Ubuntu 16.04 has 5.5. -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=appdir/usr -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON -Dqssldiffiehellmanparameters=OFF $BUILD_SOURCESDIRECTORY +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=appdir/usr -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON \ + -Dqssldiffiehellmanparameters=OFF -Donline-tests=ON $BUILD_SOURCESDIRECTORY cmake --build . ctest --verbose cmake --install . diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index a8f78bb05..72fa53fb4 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -17,7 +17,8 @@ VER=$(python scripts/mumble-version.py) cd $BUILD_BINARIESDIRECTORY -cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON $BUILD_SOURCESDIRECTORY +cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \ + -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Donline-tests=ON $BUILD_SOURCESDIRECTORY cmake --build . ctest --verbose diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index 6d5c54392..a5cabac0a 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -49,7 +49,9 @@ del C:\Strawberry\c\bin\gcc.exe del C:\Strawberry\c\bin\g++.exe del C:\Strawberry\c\bin\c++.exe -cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON "%BUILD_SOURCESDIRECTORY%" +cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% ^ + -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON ^ + -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON -Donline-tests=ON "%BUILD_SOURCESDIRECTORY%" if errorlevel 1 ( exit /b %errorlevel% diff --git a/.ci/travis-ci/script.bash b/.ci/travis-ci/script.bash index cfc95a8c7..e79f827dd 100755 --- a/.ci/travis-ci/script.bash +++ b/.ci/travis-ci/script.bash @@ -16,7 +16,7 @@ VER=$(python scripts/mumble-version.py) if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then mkdir build && cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON .. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON .. cmake --build . # We don't execute tests on ARM64 because TestPacketDataStream fails. # See https://github.com/mumble-voip/mumble/issues/3845. @@ -25,7 +25,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then elif [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then mkdir build && cd build # We specify the absolute path because otherwise Travis CI's CMake is used. - /usr/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON .. + /usr/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON .. /usr/bin/cmake --build . /usr/bin/ctest --verbose sudo /usr/bin/cmake --install . @@ -38,7 +38,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then PATH=$PATH:/usr/lib/mxe/usr/bin - ${MUMBLE_HOST}.static-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dbonjour=OFF -Dice=OFF -Doverlay=OFF .. + ${MUMBLE_HOST}.static-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Dasio=ON \ + -Dbonjour=OFF -Dice=OFF -Doverlay=OFF -Donline-tests=ON .. cmake --build . # TODO: investigate why tests fail. #ctest |