diff options
| author | Robert <krzmbrzl@gmail.com> | 2020-09-28 09:34:42 +0300 |
|---|---|---|
| committer | Robert <krzmbrzl@gmail.com> | 2020-10-24 15:47:17 +0300 |
| commit | 54a1918cd4d81209e19f49ec801478219d2ba225 (patch) | |
| tree | 9954534dc1439ff0e01cf6beab49026106170d07 /.ci/azure-pipelines | |
| parent | 767b29d69c1c9f651c106a4188f75347777bc71b (diff) | |
CI: Enable gRPC support
In order to make sure we don't break things, we should include gRPC in
the built feature set on our CI.
Diffstat (limited to '.ci/azure-pipelines')
| -rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 2 | ||||
| -rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 2 | ||||
| -rw-r--r-- | .ci/azure-pipelines/build_windows.bat | 2 | ||||
| -rwxr-xr-x | .ci/azure-pipelines/install-environment_linux.bash | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index 690e73de5..fd52ddcf7 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -19,7 +19,7 @@ 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 -Dtests=ON Donline-tests=ON -Dversion=$VER -Dsymbols=ON \ - -Dqssldiffiehellmanparameters=OFF -Donline-tests=ON $BUILD_SOURCESDIRECTORY + -Dqssldiffiehellmanparameters=OFF -Donline-tests=ON -Dgrpc=ON $BUILD_SOURCESDIRECTORY cmake --build . ctest --verbose diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index 55ee57959..95d1799c6 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -18,7 +18,7 @@ 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 -Dtests=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Donline-tests=ON $BUILD_SOURCESDIRECTORY + -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON $BUILD_SOURCESDIRECTORY cmake --build . ctest --verbose diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index 2f7cd3326..da7e437e6 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -51,7 +51,7 @@ 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 -Dtests=ON ^ - -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON -Donline-tests=ON "%BUILD_SOURCESDIRECTORY%" + -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON -Donline-tests=ON -Dgrpc=ON "%BUILD_SOURCESDIRECTORY%" if errorlevel 1 ( exit /b %errorlevel% diff --git a/.ci/azure-pipelines/install-environment_linux.bash b/.ci/azure-pipelines/install-environment_linux.bash index b2931e12c..c5b7face2 100755 --- a/.ci/azure-pipelines/install-environment_linux.bash +++ b/.ci/azure-pipelines/install-environment_linux.bash @@ -9,9 +9,9 @@ sudo apt-get update sudo apt-get -y install build-essential g++-multilib ninja-build pkg-config \ qt5-default qttools5-dev qttools5-dev-tools libqt5svg5-dev \ - libboost-dev libssl-dev libprotobuf-dev protobuf-compiler \ + libboost-dev libssl-dev libprotobuf-dev protobuf-compiler libprotoc-dev \ libcap-dev libxi-dev \ libasound2-dev libasound2-plugins libasound2-plugins-extra\ libogg-dev libsndfile1-dev libspeechd-dev \ libavahi-compat-libdnssd-dev libzeroc-ice-dev \ - zsync appstream libgrpc++-dev + zsync appstream libgrpc++-dev protobuf-compiler-grpc |