Merge branch 'fix-ci' of github.com:jackaudio/jack2 into develop

.ci/install-deps.sh

@@ -23,6 +23,10 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
   if [ "${CC}" == "gcc-8" ]; then
     brew install gcc@8
   fi
+  # force installation of gcc-9 if required
+  if [ "${CC}" == "gcc-9" ]; then
+    brew install gcc@9
+  fi
 fi
 
 if [ "$TRAVIS_OS_NAME" == "linux" ]; then
@@ -34,7 +38,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     libsndfile-dev \
     libasound2-dev \
     libdb-dev \
-    systemd-services \
     systemd \
     libsystemd-dev \
     libpam-systemd \
@@ -73,10 +76,26 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
   if [ "${CC}" == "gcc-8" ]; then
     sudo apt-get install gcc-8 g++-8
   fi
+  # force installation of gcc-9 if required
+  if [ "${CC}" == "gcc-9" ]; then
+    sudo apt-get install gcc-9 g++-9
+  fi
+  # force installation of clang-3.5 if required
+  if [ "${CC}" == "clang-3.5" ]; then
+    sudo apt-get install clang-3.5
+  fi
   # force installation of clang-3.8 if required
   if [ "${CC}" == "clang-3.8" ]; then
     sudo apt-get install clang-3.8
   fi
+  # force installation of clang-6.0 if required
+  if [ "${CC}" == "clang-6.0" ]; then
+    sudo apt-get install clang-6.0
+  fi
+  # force installation of clang-8 if required
+  if [ "${CC}" == "clang-8" ]; then
+    sudo apt-get install clang-8
+  fi
 fi
 
 exit 0

.travis.yml

@@ -4,6 +4,18 @@ sudo: required
 
 matrix:
   include:
+    # linux with gcc 9
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          install:
+            - gcc-9
+      dist: bionic
+      env:
+        - MATRIX_EVAL="CC=gcc-9 CXX=g++-9"
+      compiler: gcc
     # linux with gcc 8
     - os: linux
       addons:
@@ -12,7 +24,7 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-8
-      dist: xenial
+      dist: bionic
       env:
         - MATRIX_EVAL="CC=gcc-8 CXX=g++-8"
       compiler: gcc
@@ -24,7 +36,7 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-7
-      dist: xenial
+      dist: bionic
       env:
         - MATRIX_EVAL="CC=gcc-7 CXX=g++-7"
       compiler: gcc
@@ -36,17 +48,45 @@ matrix:
             - ubuntu-toolchain-r-test
           install:
             - gcc-6
-      dist: xenial
+      dist: bionic
       env:
         - MATRIX_EVAL="CC=gcc-6 CXX=g++-6"
       compiler: gcc
-    # linux with gcc default (4.8)
+    # linux with gcc 5
     - os: linux
-      dist: xenial
+      dist: bionic
+      env:
+        - MATRIX_EVAL="CC=gcc CXX=g++"
       compiler: gcc
-    # linux with clang default (3.5)
+    # linux with gcc 4
     - os: linux
       dist: xenial
+      env:
+        - MATRIX_EVAL="CC=gcc CXX=g++"
+      compiler: gcc
+    # linux with clang 8
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          install:
+            - clang-8
+      dist: bionic
+      env:
+        - MATRIX_EVAL="CC=clang-8 CXX=clang++-8"
+      compiler: clang
+    # linux with clang 6
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          install:
+            - clang-6.0
+      dist: bionic
+      env:
+        - MATRIX_EVAL="CC=clang-6.0 CXX=clang++-6.0"
       compiler: clang
     # linux with clang 3.8
     - os: linux
@@ -99,12 +139,13 @@ script:
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         ./waf configure --prefix=/usr --alsa --classic --dbus --systemd-unit;
         ./waf -v build;
+        sudo ./waf -v install;
       fi
     - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-        CXXFLAGS="${CXXFLAGS} -flax-vector-conversions" ./waf configure;
-        CXXFLAGS="${CXXFLAGS} -flax-vector-conversions" ./waf -v build;
+        CXXFLAGS="${CXXFLAGS} -flax-vector-conversions" python2 ./waf configure;
+        CXXFLAGS="${CXXFLAGS} -flax-vector-conversions" python2 ./waf -v build;
+        sudo python2 ./waf -v install;
       fi
-    - sudo ./waf -v install
 # run very basic tests
     - sudo .ci/test_run.sh