diff options
| author | Robert Adam <dev@robert-adam.de> | 2020-04-20 09:56:21 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2020-04-20 13:07:26 +0300 |
| commit | 4ab0e03492f65ec29009250733124d4c05b62303 (patch) | |
| tree | e6972f654d8238a078921566a72f78a8756c8f53 | |
| parent | fa8e9b2fcbba412787d87b9591367bfb630ad4c5 (diff) | |
CI: Include GRPC support
We have had multiple cases now in which there have been some errors in
changes related to GRPC that weren't detected by the CI because it
excluded the GRPC code from the build process. This will bw changed now.
As all other CIs have been stubborn, for now we'll only build GRPC on
travis as these use a new-enough Ubuntu version to be able to build
GRPC.
MacOS CI I haven't got to work with the whole homebrew stuff and Windows
is done in its own repo (which I won't touch either).
m
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 3 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index 53627b8ed..7ac278c99 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -22,7 +22,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then libcap-dev libxi-dev \ libasound2-dev libpulse-dev \ libogg-dev libsndfile1-dev libspeechd-dev \ - libavahi-compat-libdnssd-dev libzeroc-ice-dev libg15daemon-client-dev + libavahi-compat-libdnssd-dev libzeroc-ice-dev libg15daemon-client-dev \ + libgrpc++-dev libprotoc-dev protobuf-compiler-grpc elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then sudo dpkg --add-architecture i386 sudo apt-get -qq update diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index a20851b1b..b92fd5cfb 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -17,11 +17,11 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${MUMBLE_NO_PCH}" == "1" ]; then EXTRA_CONFIG="no-pch ${EXTRA_CONFIG}" fi - qmake CONFIG+="release tests g15-emulator ${EXTRA_CONFIG}" DEFINES+="MUMBLE_VERSION=${TRAVIS_COMMIT:0:7}" -recursive + qmake CONFIG+="release tests g15-emulator grpc ${EXTRA_CONFIG}" DEFINES+="MUMBLE_VERSION=${TRAVIS_COMMIT:0:7}" -recursive make -j2 make check elif [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then - qmake CONFIG+="release tests warnings-as-errors ${EXTRA_CONFIG}" -recursive + qmake CONFIG+="release tests warnings-as-errors grpc ${EXTRA_CONFIG}" -recursive make -j $(nproc) elif [ "${MUMBLE_HOST}" == "i686-w64-mingw32" ]; then wget http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip -P ../ |