widelands

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

  1. clang-7
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 8909
Proposed branch: lp:~hjd/widelands/clang-7
Merge into: lp:widelands
Diff against target: 42 lines (+7/-7)
1 file modified
.travis.yml (+7/-7)
To merge this branch: bzr merge lp:~hjd/widelands/clang-7
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+358272@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Travis is green :)

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.yml'
2--- .travis.yml 2018-05-02 16:41:45 +0000
3+++ .travis.yml 2018-11-03 10:32:30 +0000
4@@ -25,8 +25,8 @@
5 key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key"
6 - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.5 main"
7 key_url: "http://apt.llvm.org/llvm-snapshot.gpg.key"
8- - llvm-toolchain-trusty-5.0
9 - llvm-toolchain-trusty-6.0
10+ - llvm-toolchain-trusty-7
11 packages:
12 - cmake
13 - libboost-dev
14@@ -59,22 +59,22 @@
15 env: CLANG_VERSION="3.5" BUILD_TYPE="Debug"
16 - os: linux
17 compiler: clang
18- env: CLANG_VERSION="5.0" BUILD_TYPE="Debug"
19- - os: linux
20- compiler: clang
21 env: CLANG_VERSION="6.0" BUILD_TYPE="Debug"
22 - os: linux
23 compiler: clang
24+ env: CLANG_VERSION="7" BUILD_TYPE="Debug"
25+ - os: linux
26+ compiler: clang
27 env: CLANG_VERSION="3.4" BUILD_TYPE="Release"
28 - os: linux
29 compiler: clang
30 env: CLANG_VERSION="3.5" BUILD_TYPE="Release"
31 - os: linux
32 compiler: clang
33- env: CLANG_VERSION="5.0" BUILD_TYPE="Release"
34- - os: linux
35- compiler: clang
36 env: CLANG_VERSION="6.0" BUILD_TYPE="Release"
37+ - os: linux
38+ compiler: clang
39+ env: CLANG_VERSION="7" BUILD_TYPE="Release"
40 ### LINUX + GCC BUILDS
41 - os: linux
42 compiler: gcc

Subscribers

People subscribed via source and target branches

to status/vote changes: