Clang-format: fix some header files and remove them from whitelist

[minetest.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4bce211f7af5ddcd455edeb1f2be6e686b7ba89a..57d934c90fa62b6a53e7e0973b3580d75688b2e4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,39 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-env:
-  - WINDOWS=32
-  - WINDOWS=64
-  - WINDOWS=no
 before_install: ./util/travis/before_install.sh
 script: ./util/travis/script.sh
+sudo: required
 notifications:
   email: false
 matrix:
   fast_finish: true
-  exclude:
-    - env: WINDOWS=32
+  include:
+    - env: PLATFORM=Win32
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+    - env: PLATFORM=Unix COMPILER=clang
       compiler: clang
-    - env: WINDOWS=64
+      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