Renaming the function wasn't enough

[dragonfireclient.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 534479efb7aa8b3b3b9c6fde77449f1ce76d855e..bdf3e8d42df9ea4b5378df6c94e2cc1394b89d2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,30 +2,102 @@ language: cpp
 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
   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
-      compiler: clang
-      os: osx
-    - env: PLATFORM=Unix COMPILER=g++
+
+#    - 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
-    - env: PLATFORM=Unix COMPILER=clang
+      addons:
+        apt:
+          packages: ['gcc-8', 'g++-8']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+
+    - env: PLATFORM=Unix COMPILER=clang-3.6
       compiler: clang
       os: linux
-    - env: PLATFORM=Unix COMPILER=g++-6
-      compiler: gcc
+      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:
-    sources: &sources
-      - ubuntu-toolchain-r-test
+      addons:
+        apt:
+          packages: ['valgrind', 'clang-7', 'clang++-7']
+          sources: &sources
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
+