Merge lp:~hjd/widelands/clang-6.0 into lp:widelands

[Hans Joachim Desserud]

Replaced clang-4.0 with clang-6.0. Let's see how Travis responds. :)

Seems to be working https://travis-ci.org/widelands/widelands/builds/370207384

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3405. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/370207384.
Appveyor build 3211. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_clang_6_0-3211.

[GunChleoc (gunchleoc)]

Thanks!

@bunnybot merge

review: Approve

=== modified file '.travis.yml'
--- .travis.yml	2017-12-03 08:23:27 +0000
+++ .travis.yml	2018-04-23 16:36:56 +0000
@@ -25,8 +25,8 @@
         key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key"
       - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.5 main"
         key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key"
-      - llvm-toolchain-trusty-4.0
       - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-6.0
     packages:
       - cmake
       - libboost-dev
@@ -59,22 +59,22 @@
       env: CLANG_VERSION="3.5" BUILD_TYPE="Debug"
     - os: linux
       compiler: clang
-      env: CLANG_VERSION="4.0" BUILD_TYPE="Debug"
-    - os: linux
-      compiler: clang
       env: CLANG_VERSION="5.0" BUILD_TYPE="Debug"
     - os: linux
       compiler: clang
+      env: CLANG_VERSION="6.0" BUILD_TYPE="Debug"
+    - os: linux
+      compiler: clang
       env: CLANG_VERSION="3.4" BUILD_TYPE="Release"
     - os: linux
       compiler: clang
       env: CLANG_VERSION="3.5" BUILD_TYPE="Release"
     - os: linux
       compiler: clang
-      env: CLANG_VERSION="4.0" BUILD_TYPE="Release"
-    - os: linux
-      compiler: clang
       env: CLANG_VERSION="5.0" BUILD_TYPE="Release"
+    - os: linux
+      compiler: clang
+      env: CLANG_VERSION="6.0" BUILD_TYPE="Release"
     ### LINUX + GCC BUILDS
     - os: linux
       compiler: gcc