widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/clang-7 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/clang-7/+merge/358272

LLVM 7 was recently released, including a newer version of Clang. A repo making this available for travis builds has also been added [1], so our build matrix can be updated.

Replaced clang 5.0 with clang 7, to ensure that Widelands builds with the two most recent versions.


(I am not sure if our default shell script handles the version change from X.0 to X, but let's see form the build logs how it works)

[1] https://github.com/travis-ci/apt-source-safelist/commit/25b38f72dcb0e2d995895390b904f4339ab1b8fc
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/clang-7 into lp:widelands.

=== modified file '.travis.yml'
--- .travis.yml	2018-05-02 16:41:45 +0000
+++ .travis.yml	2018-11-03 10:32:30 +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-5.0
       - llvm-toolchain-trusty-6.0
+      - llvm-toolchain-trusty-7
     packages:
       - cmake
       - libboost-dev
@@ -59,22 +59,22 @@
       env: CLANG_VERSION="3.5" 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="7" 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="5.0" BUILD_TYPE="Release"
-    - os: linux
-      compiler: clang
       env: CLANG_VERSION="6.0" BUILD_TYPE="Release"
+    - os: linux
+      compiler: clang
+      env: CLANG_VERSION="7" BUILD_TYPE="Release"
     ### LINUX + GCC BUILDS
     - os: linux
       compiler: gcc