Menu: Merge singleplayer and server tabs (#5627)

[minetest.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b7f58cbe48e1af90ca31d8d2edbffcf31882e362..57d934c90fa62b6a53e7e0973b3580d75688b2e4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,39 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-before_install: 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=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