Fix bug setting channel window size.

[dragonfireclient.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index eaa8fd1ac3e686a7f17ac3fd643f86e8de0f6503..2409a51cd5c661c460b167f5629666bf11fc3875 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,26 @@ notifications:
 matrix:
   fast_finish: true
   include:
+
+    - env: LINT=1
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages: ['clang-format-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
+    - env: CLANG_TIDY=1
+      compiler: clang
+      os: linux
+      script: ./util/travis/clangtidy.sh
+      addons:
+        apt:
+          packages: ['clang-tidy-5.0']
+          sources: &sources
+            - llvm-toolchain-trusty-5.0
+
     - env: PLATFORM=Win32
       compiler: gcc
       os: linux
@@ -61,32 +81,29 @@ matrix:
           sources: &sources
             - llvm-toolchain-trusty-3.6
 
-    - env: PLATFORM=Unix COMPILER=clang-4.0
+    - env: PLATFORM=Unix COMPILER=clang-5.0
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['clang-4.0', 'clang++-4.0']
+          packages: ['clang-5.0', 'clang++-5.0']
           sources: &sources
-            - llvm-toolchain-trusty-4.0
+            - llvm-toolchain-trusty-5.0
 
-    - env: PLATFORM=Unix COMPILER=clang-4.0 VALGRIND=1
+    - env: PLATFORM=Unix COMPILER=clang-5.0 FREETYPE=0
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['valgrind', 'clang-4.0', 'clang++-4.0']
+          packages: ['clang-5.0', 'clang++-5.0']
           sources: &sources
-            - llvm-toolchain-trusty-4.0
+            - llvm-toolchain-trusty-5.0
 
-    - env: LINT=1
+    - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['clang-format-4.0']
+          packages: ['valgrind', 'clang-5.0', 'clang++-5.0']
           sources: &sources
-            - llvm-toolchain-trusty-4.0
-
-
-
+            - llvm-toolchain-trusty-5.0