travis: fix addons

mapbox · Dec 14, 2016 · ce2eea6 · ce2eea6
1 parent efa75df
commit ce2eea6
Showing 1 changed file with 52 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,81 +15,94 @@ matrix:
     - os: linux
       compiler: "clang35"
       env: CXX=clang++-3.5 COVERAGE=True
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
-        packages: [ 'clang-3.5' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
+          packages: [ 'clang-3.5' ]
     - os: linux
       compiler: "clang36"
       env: CXX=clang++-3.6
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ]
-        packages: [ 'clang-3.6' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6' ]
+          packages: [ 'clang-3.6' ]
     - os: linux
       compiler: "clang37"
       env: CXX=clang++-3.7
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7' ]
-        packages: [ 'clang-3.7' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7' ]
+          packages: [ 'clang-3.7' ]
     - os: linux
       compiler: "clang38"
       env: CXX=clang++-3.8
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8' ]
-        packages: [ 'clang-3.8' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8' ]
+          packages: [ 'clang-3.8' ]
     - os: linux
       compiler: "clang38"
       env: CXX=clang++-3.8 CXX_STD=c++14
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8' ]
-        packages: [ 'clang-3.8' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.8' ]
+          packages: [ 'clang-3.8' ]
     - os: linux
       compiler: "clang39"
       env: CXX=clang++-3.9
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.9' ]
-        packages: [ 'clang-3.9' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.9' ]
+          packages: [ 'clang-3.9' ]
     - os: linux
       compiler: "gcc47"
       env: CXX=g++-4.7
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-4.7' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-4.7' ]
     - os: linux
       compiler: "gcc48"
       env: CXX=g++-4.8
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-4.8' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-4.8' ]
     - os: linux
       compiler: "gcc49"
       env: CXX=g++-4.9
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-4.9' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-4.9' ]
     - os: linux
       compiler: "gcc49"
       env: CXX=g++-4.9 CXX_STD=c++14
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-4.9' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-4.9' ]
     - os: linux
       compiler: "gcc5"
       env: CXX=g++-5 CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0"
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-5' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-5' ]
     - os: linux
       compiler: "gcc5"
       env: CXX=g++-5 CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1"
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-5' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-5' ]
     - os: linux
       compiler: "gcc6"
       env: CXX=g++-6
-      apt:
-        sources: [ 'ubuntu-toolchain-r-test' ]
-        packages: [ 'g++-6' ]
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'g++-6' ]
 
 before_install:
  - echo ${CXX}