X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=bdf3e8d42df9ea4b5378df6c94e2cc1394b89d2b;hb=0f758a182bd7da96f73715560f1c1408f74d9632;hp=d17af5463cb96c5325a58180f63ba30db44eb07e;hpb=93fcab952b28f4db39d9326b83f14cbd86c0cf17;p=minetest.git

diff --git a/.travis.yml b/.travis.yml
index d17af5463..bdf3e8d42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,103 @@
 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:
-    - env: PLATFORM=Win32
+  include:
+
+    - env: CLANG_FORMAT=clang-format-7
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-format-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: CLANG_TIDY=clang-tidy-7
       compiler: clang
+      os: linux
+      script: ./util/travis/clangtidy.sh
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7', 'clang-tools-7', 'clang-tidy-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Win32
+      compiler: gcc
+      os: linux
+
     - env: PLATFORM=Win64
+      compiler: gcc
+      os: linux
+
+#    - 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-8
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages: ['gcc-8', 'g++-8']
+          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-7
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Unix COMPILER=clang-7 FREETYPE=0
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+
+    - env: PLATFORM=Unix COMPILER=clang-7 VALGRIND=1
       compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['valgrind', 'clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+