From 5d4e9317263239fb490aea0a9a6aabf272390452 Mon Sep 17 00:00:00 2001
From: Kirill Kirilenko <kirill@ultracoder.org>
Date: Tue, 4 Oct 2016 15:42:57 +0300
Subject: [PATCH] Fixed .travis.yml.

---
 .travis.yml | 73 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b7b716..28495bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,48 +1,59 @@
+sudo: required
+dist: precise
 language: cpp
 
-sudo: false
-cache: ccache
+matrix:
+  include:
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env: COMPILER=g++-4.9
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+      env: COMPILER=g++-5
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
+      env: COMPILER=clang++-3.6
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
+          packages:
+            - clang-3.7
+      env: COMPILER=clang++-3.7
 
-compiler: clang
-
-# gcc 4.9 default
-addons: &addons
+addons:
   apt:
-    packages: &packages
-      - g++-4.9
+    packages:
       - libboost-test-dev
       - libboost-system-dev
       - libcurl4-openssl-dev
-    sources: &sources
-      - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.5
 
 env:
   global:
     - TELEBOTXX_BUILD_TESTS=ON
     - TELEBOTXX_GENERATE_DOC=OFF
-  matrix:
-    - COMPILER=g++-4.9 CCOMPILER=gcc-4.9
-
-matrix:
-  include:
-    # gcc 4.9
-    - env: COMPILER=g++-4.9 CCOMPILER=gcc-4.9
-      addons:
-        apt:
-          packages: g++-4.9
-          sources: *sources
-
-    # Clang 3.5
-    - env: COMPILER=clang++-3.5 CCOMPILER=clang-3.5
-      addons:
-        apt:
-          packages: clang-3.5
-          sources: *sources
 
 before_script:
-  - export CXX=$COMPILER CC=$CCOMPILER
+  - export CXX=$COMPILER
   - ./configure
 
 script:
-  - make -j2 VERBOSE=1
+  - make VERBOSE=1