From fae16c96e46834fbd860ee508885b26206525988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= Date: Fri, 27 Dec 2019 15:33:15 -0500 Subject: Switch Travis CI distribution to bionic Older versions of ccrtp under trusty/xenial do not compile with g++ 7+, so moving on to bionic will finally allow us to test modern compilers. (Ironically, current ccrtp will no longer compile with g++ 4.9.) Note that libzrtpcpp is no longer available on bionic, so it was disabled from the tests. --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index de77d41..0a4e25e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,19 @@ language: cpp -dist: trusty +dist: bionic sudo: required env: global: - - FLAGS="-DWITH_QT5=ON -DWITH_ALSA=ON -DWITH_GSM=ON -DWITH_SPEEX=ON -DWITH_ZRTP=ON" + - FLAGS="-DWITH_QT5=ON -DWITH_ALSA=ON -DWITH_GSM=ON -DWITH_SPEEX=ON -DWITH_ZRTP=OFF" # (qttools5-dev-tools is explicitly included because of Debian bug #835295) - - PACKAGES="libasound2-dev libgsm1-dev libspeex-dev libspeexdsp-dev libzrtpcpp-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools" + - PACKAGES="libasound2-dev libgsm1-dev libspeex-dev libspeexdsp-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools" matrix: # Test various compiler versions - - PACKAGES_ADD="g++-4.9" MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - PACKAGES_ADD="g++-5" MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - PACKAGES_ADD="g++-6" MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - # The version of uCommon available on trusty (6.0.7) will cause a build - # failure when compiling with GCC 7 or Clang. - #- PACKAGES_ADD="g++-7" MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - PACKAGES_ADD="g++-7" MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - PACKAGES_ADD="g++-8" MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - PACKAGES_ADD="g++-9" MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" # Test with all options disabled - FLAGS="-DWITH_QT5=OFF -DWITH_ALSA=OFF -DWITH_GSM=OFF -DWITH_SPEEX=OFF -DWITH_ZRTP=OFF" PACKAGES="" -- cgit v1.2.3 From 2e33ed900c19855057051a0346678953f5452d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= Date: Fri, 27 Dec 2019 16:03:07 -0500 Subject: Test building with Clang as well as GCC on Travis CI Twinkle didn't compile with Clang back on trusty (due to libucommon); now that we've upgraded to bionic, we can finally test building with it. --- .travis.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a4e25e..67a721c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,15 @@ env: - PACKAGES="libasound2-dev libgsm1-dev libspeex-dev libspeexdsp-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools" matrix: # Test various compiler versions - - PACKAGES_ADD="g++-5" MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - - PACKAGES_ADD="g++-6" MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - - PACKAGES_ADD="g++-7" MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - - PACKAGES_ADD="g++-8" MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - - PACKAGES_ADD="g++-9" MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + - PACKAGES_ADD="g++-5" MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" + - PACKAGES_ADD="g++-6" MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" + - PACKAGES_ADD="g++-7" MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + - PACKAGES_ADD="g++-8" MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" + - PACKAGES_ADD="g++-9" MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" + - PACKAGES_ADD="clang-3.9" MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" + - PACKAGES_ADD="clang-4.0" MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0" + - PACKAGES_ADD="clang-5.0" MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" + - PACKAGES_ADD="clang-6.0" MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" # Test with all options disabled - FLAGS="-DWITH_QT5=OFF -DWITH_ALSA=OFF -DWITH_GSM=OFF -DWITH_SPEEX=OFF -DWITH_ZRTP=OFF" PACKAGES="" -- cgit v1.2.3 From 62ff5807d14bb4f4f794f7dd6a99fb975d45e932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bri=C3=A8re?= Date: Fri, 27 Dec 2019 16:24:42 -0500 Subject: Also test building with Clang 7 and 8 (These are present in bionic-updates, which I had forgotten about.) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 67a721c..671a119 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ env: - PACKAGES_ADD="clang-4.0" MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0" - PACKAGES_ADD="clang-5.0" MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" - PACKAGES_ADD="clang-6.0" MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" + - PACKAGES_ADD="clang-7" MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" + - PACKAGES_ADD="clang-8" MATRIX_EVAL="CC=clang-8 && CXX=clang++-8" # Test with all options disabled - FLAGS="-DWITH_QT5=OFF -DWITH_ALSA=OFF -DWITH_GSM=OFF -DWITH_SPEEX=OFF -DWITH_ZRTP=OFF" PACKAGES="" -- cgit v1.2.3