Android dependencies updates (#5755)

[dragonfireclient.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d7ee23876895eb72bdc15365ed9b62797a9783be..57d934c90fa62b6a53e7e0973b3580d75688b2e4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,4 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-env:
-  - PLATFORM=Win32
-  - PLATFORM=Win64
-  - PLATFORM=Linux
 before_install: ./util/travis/before_install.sh
 script: ./util/travis/script.sh
 sudo: required
@@ -13,8 +6,34 @@ notifications:
   email: false
 matrix:
   fast_finish: true
-  exclude:
+  include:
     - env: PLATFORM=Win32
-      compiler: clang
+      compiler: gcc
+      os: linux
     - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang
+      compiler: clang
+      os: osx
+    - env: PLATFORM=Unix COMPILER=g++
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang
+      compiler: clang
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang VALGRIND=1
+      compiler: clang
+      os: linux
+      dist: trusty
+    - env: COMPILER=none LINT=1
       compiler: clang
+      os: linux
+      dist: trusty
+    - env: PLATFORM=Unix COMPILER=g++-6
+      compiler: gcc
+      os: linux
+addons:
+  apt:
+    sources: &sources
+      - ubuntu-toolchain-r-test