travis: remove gcc49 and clang39, add clang6 and clang7

FluidSynth · Oct 7, 2018 · 450250e · 450250e
1 parent c93fdd4
commit 450250e
Showing 1 changed file with 32 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,20 +53,6 @@ matrix:
       env:
          - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
          - CMAKE_FLAGS="-Denable-floats=0"
-
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-            - cmake-data
-            - cmake
-            - libglib2.0-0
-            - ladspa-sdk
-      env:
-         - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
 
     # works on Precise and Trusty
     - os: linux
@@ -141,6 +127,12 @@ matrix:
             - cmake-data
             - cmake
             - libglib2.0-0
+            - libsndfile-dev
+            - libasound2-dev
+            - libjack-dev
+            - portaudio19-dev
+            - libpulse-dev
+            - libdbus-glib-1-dev
             - ladspa-sdk
       env:
         - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
@@ -150,51 +142,62 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-3.9
+            - llvm-toolchain-trusty-4.0
           packages:
-            - clang-3.9
+            - clang-4.0
             - cmake-data
             - cmake
             - libglib2.0-0
-            - libsndfile-dev
-            - libasound2-dev
-            - libjack-dev
-            - portaudio19-dev
-            - libpulse-dev
-            - libdbus-glib-1-dev
             - ladspa-sdk
       env:
-        - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+        - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
 
     # works on Trusty
     - os: linux
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-4.0
+            - llvm-toolchain-trusty-5.0
           packages:
-            - clang-4.0
+            - clang-5.0
             - cmake-data
             - cmake
             - libglib2.0-0
             - ladspa-sdk
       env:
-        - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
+        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
 
     # works on Trusty
     - os: linux
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
           packages:
-            - clang-5.0
+            - clang-6.0
             - cmake-data
             - cmake
             - libglib2.0-0
             - ladspa-sdk
       env:
-        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+        - MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
+
+    # works on Trusty
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+          packages:
+            - clang-7
+            - cmake-data
+            - cmake
+            - libglib2.0-0
+            - ladspa-sdk
+      env:
+        - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
 
     - os: osx
       osx_image: xcode8