X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=534479efb7aa8b3b3b9c6fde77449f1ce76d855e;hb=93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef;hp=a1f5b48ddf4d3efe9132ecde3f289b6dd8dc6f40;hpb=d6e28c19b59e336f4581682baacb6afb66956f95;p=minetest.git

diff --git a/.travis.yml b/.travis.yml
index a1f5b48dd..534479efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +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 pool.sks-keyservers.net --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:
-  - mkdir -p travisbuild
-  - cd travisbuild
-  - cmake ..
-  - make -j2
+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