travis: always install gcc-5 and clang-3.8 as yaml does not allow to …

…merge arrays

Signed-off-by: Johannes Meyer <[email protected]>

.travis.yml

@@ -5,6 +5,8 @@ language: cpp
 
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - libxml-xpath-perl
       - libboost-all-dev
@@ -13,6 +15,8 @@ addons:
       - omniorb-nameserver
       - libomniorb4-dev
       - pkg-config
+      - g++-5
+      - clang-3.8
 
 env:
   global:
@@ -22,38 +26,14 @@ env:
 
 matrix:
   include:
-    - compiler: gcc
-      env: CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
-    - compiler: gcc
-      env: CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
+    - env: COMPILER=gcc CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
+    - env: COMPILER=gcc CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
     - env: COMPILER=gcc-5 CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
     - env: COMPILER=gcc-5 CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-    - compiler: clang
-      env: CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
-    - compiler: clang
-      env: CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
+    - env: COMPILER=clang CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
+    - env: COMPILER=clang CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
     - env: COMPILER=clang-3.8 CXXFLAGS="-std=c++03 -Wall -Wextra -Wno-unused-parameter"
-      addons:
-        apt:
-          packages:
-            - clang-3.8
     - env: COMPILER=clang-3.8 CXXFLAGS="-std=c++11 -Wall -Wextra -Wno-unused-parameter"
-      addons:
-        apt:
-          packages:
-            - clang-3.8
 
 install:
   - |