Fix unnecessary exception use in 3 more methods (#8791)

[dragonfireclient.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 77c405b69c42fd630038afbfb5a850881f5e5b36..bdf3e8d42df9ea4b5378df6c94e2cc1394b89d2b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,30 +9,40 @@ notifications:
 matrix:
   fast_finish: true
   include:
-    - env: PLATFORM=Win32
-      compiler: gcc
+
+    - env: CLANG_FORMAT=clang-format-7
+      compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['gcc-mingw-w64-i686', 'g++-mingw-w64-i686', 'binutils-mingw-w64-i686']
+          packages: ['clang-format-7']
           sources: &sources
             - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
+            - llvm-toolchain-trusty-7
 
-    - env: PLATFORM=Win64
-      compiler: gcc
+    - env: CLANG_TIDY=clang-tidy-7
+      compiler: clang
       os: linux
+      script: ./util/travis/clangtidy.sh
       addons:
         apt:
-          packages: ['gcc-mingw-w64-x86-64', 'g++-mingw-w64-x86-64', 'binutils-mingw-w64-x86-64']
+          packages: ['clang-7', 'clang++-7', 'clang-tools-7', 'clang-tidy-7']
           sources: &sources
             - ubuntu-toolchain-r-test
-            - sourceline: 'deb http://mirrors.kernel.org/ubuntu xenial main universe'
+            - llvm-toolchain-trusty-7
 
-    - env: PLATFORM=Unix
-      compiler: clang
-      os: osx
-      osx_image: xcode8
+    - 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
@@ -43,12 +53,12 @@ matrix:
           sources: &sources
             - ubuntu-toolchain-r-test
 
-    - env: PLATFORM=Unix COMPILER=gcc-7
+    - env: PLATFORM=Unix COMPILER=gcc-8
       compiler: gcc
       os: linux
       addons:
         apt:
-          packages: ['gcc-7', 'g++-7']
+          packages: ['gcc-8', 'g++-8']
           sources: &sources
             - ubuntu-toolchain-r-test
 
@@ -61,32 +71,33 @@ matrix:
           sources: &sources
             - llvm-toolchain-trusty-3.6
 
-    - env: PLATFORM=Unix COMPILER=clang-5.0
+    - env: PLATFORM=Unix COMPILER=clang-7
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['clang-5.0', 'clang++-5.0']
+          packages: ['clang-7', 'clang++-7']
           sources: &sources
-            - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
 
-    - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1
+    - env: PLATFORM=Unix COMPILER=clang-7 FREETYPE=0
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['valgrind', 'clang-5.0', 'clang++-5.0']
+          packages: ['clang-7', 'clang++-7']
           sources: &sources
-            - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7
 
-    - env: LINT=1
+    - env: PLATFORM=Unix COMPILER=clang-7 VALGRIND=1
       compiler: clang
       os: linux
       addons:
         apt:
-          packages: ['clang-format-5.0']
+          packages: ['valgrind', 'clang-7', 'clang++-7']
           sources: &sources
-            - llvm-toolchain-trusty-5.0
-
-
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-7