diff options
| author | Frédéric Brière <fbriere@fbriere.net> | 2019-12-27 15:33:15 -0500 |
|---|---|---|
| committer | Frédéric Brière <fbriere@fbriere.net> | 2019-12-27 15:33:15 -0500 |
| commit | fae16c96e46834fbd860ee508885b26206525988 (patch) | |
| tree | fd7cf93f19e153d0f6ed276dde3de5418d19db40 | |
| parent | 05082ae12051821b1d969e6672d9e4e5afe1bc07 (diff) | |
| download | twinkle-fae16c96e46834fbd860ee508885b26206525988.tar twinkle-fae16c96e46834fbd860ee508885b26206525988.tar.gz twinkle-fae16c96e46834fbd860ee508885b26206525988.tar.lz twinkle-fae16c96e46834fbd860ee508885b26206525988.tar.xz twinkle-fae16c96e46834fbd860ee508885b26206525988.zip | |
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.
| -rw-r--r-- | .travis.yml | 13 |
1 files 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="" |