X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=77c405b69c42fd630038afbfb5a850881f5e5b36;hb=a5d5728f241fec8644ba65cb3b98c7dd1be2eee3;hp=d7ee23876895eb72bdc15365ed9b62797a9783be;hpb=31b6d2678455c0b3de7f4b97c9607388b06c8f8c;p=dragonfireclient.git

diff --git a/.travis.yml b/.travis.yml
index d7ee23876..77c405b69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,92 @@
 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
+dist: trusty
+group: edge
 notifications:
   email: false
 matrix:
   fast_finish: true
-  exclude:
+  include:
     - env: PLATFORM=Win32
-      compiler: clang
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-mingw-w64-i686', 'g++-mingw-w64-i686', 'binutils-mingw-w64-i686']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
+
     - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-mingw-w64-x86-64', 'g++-mingw-w64-x86-64', 'binutils-mingw-w64-x86-64']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
+
+    - env: PLATFORM=Unix
+      compiler: clang
+      os: osx
+      osx_image: xcode8
+
+    - env: PLATFORM=Unix COMPILER=gcc-6
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-6', 'g++-6']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+
+    - env: PLATFORM=Unix COMPILER=gcc-7
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-7', 'g++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+
+    - env: PLATFORM=Unix COMPILER=clang-3.6
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-3.6', 'clang++-3.6']
+          sources: &sources
+            - llvm-toolchain-trusty-3.6
+
+    - env: PLATFORM=Unix COMPILER=clang-5.0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-5.0', 'clang++-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
+    - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['valgrind', 'clang-5.0', 'clang++-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
+    - env: LINT=1
       compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-format-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
+
+