X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.travis.yml;h=534479efb7aa8b3b3b9c6fde77449f1ce76d855e;hb=74afe6fe6bf5bd6eeba3b6f4fbbfbe8758e7f750;hp=2cd867295757058407dcf279804a6ec74cba1b04;hpb=cbbb6447bfd3a6d0013b3605aeca840733d87561;p=oweals%2Fminetest.git

diff --git a/.travis.yml b/.travis.yml
index 2cd867295..534479efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,31 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-before_install:
-  - if [ $CC = "clang" ]; then export PATH="/usr/bin/:$PATH"; sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'; sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 92DE8183; sudo apt-get update; sudo apt-get install llvm-3.1; sudo apt-get install clang; fi
-  - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev libjpeg8-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev
-script: cmake . && make
+before_install: ./util/travis/before_install.sh
+script: ./util/travis/script.sh
+sudo: required
 notifications:
   email: false
+matrix:
+  fast_finish: true
+  include:
+    - env: PLATFORM=Win32
+      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=g++-6
+      compiler: gcc
+      os: linux
+addons:
+  apt:
+    sources: &sources
+      - ubuntu-toolchain-r-test