Skip to content

Commit a10fc11

Browse files
author
Fytch
committed
add more compilers to travis
Squashed commit of the following: commit 91dda92 Author: Fytch <[email protected]> Date: Wed Dec 18 21:42:51 2019 +0100 maybe this? no more stdlib flags commit 2038f09 Author: Fytch <[email protected]> Date: Wed Dec 18 21:32:43 2019 +0100 maybe this dist works? commit a34655a Author: Fytch <[email protected]> Date: Wed Dec 18 21:24:27 2019 +0100 remove libc++ from clang 7,8,9 in travis commit 02bf444 Author: Fytch <[email protected]> Date: Wed Dec 18 21:19:15 2019 +0100 nicer build matrix commit 5fc8044 Author: Fytch <[email protected]> Date: Wed Dec 18 21:11:01 2019 +0100 add more compilers to travis
1 parent 7ab12da commit a10fc11

File tree

1 file changed

+85
-25
lines changed

1 file changed

+85
-25
lines changed

.travis.yml

Lines changed: 85 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: cpp
22

3-
dist: trusty
4-
sudo: required
3+
sudo: false
4+
dist: xenial
55

66
notifications:
77
email: false
@@ -15,39 +15,59 @@ matrix:
1515
- ubuntu-toolchain-r-test
1616
packages:
1717
- g++-4.9
18-
env: COMPILER=g++-4.9
18+
env:
19+
- CC=gcc-4.9
20+
- CXX=g++-4.9
1921
- compiler: gcc
2022
addons:
2123
apt:
2224
sources:
2325
- ubuntu-toolchain-r-test
2426
packages:
2527
- g++-5
26-
env: COMPILER=g++-5
28+
env:
29+
- CC=gcc-5
30+
- CXX=g++-5
2731
- compiler: gcc
2832
addons:
2933
apt:
3034
sources:
3135
- ubuntu-toolchain-r-test
3236
packages:
3337
- g++-6
34-
env: COMPILER=g++-6
38+
env:
39+
- CC=gcc-6
40+
- CXX=g++-6
3541
- compiler: gcc
3642
addons:
3743
apt:
3844
sources:
3945
- ubuntu-toolchain-r-test
4046
packages:
4147
- g++-7
42-
env: COMPILER=g++-7
48+
env:
49+
- CC=gcc-7
50+
- CXX=g++-7
4351
- compiler: gcc
4452
addons:
4553
apt:
4654
sources:
4755
- ubuntu-toolchain-r-test
4856
packages:
4957
- g++-8
50-
env: COMPILER=g++-8
58+
env:
59+
- CC=gcc-8
60+
- CXX=g++-8
61+
- compiler: gcc
62+
addons:
63+
apt:
64+
sources:
65+
- ubuntu-toolchain-r-test
66+
packages:
67+
- g++-9
68+
env:
69+
- CC=gcc-9
70+
- CXX=g++-9
5171
- compiler: clang
5272
addons:
5373
apt:
@@ -59,7 +79,8 @@ matrix:
5979
- libc++-dev
6080
- libc++abi-dev
6181
env:
62-
- COMPILER=clang++-3.6
82+
- CC=clang-3.6
83+
- CXX=clang++-3.6
6384
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
6485
- compiler: clang
6586
addons:
@@ -72,7 +93,8 @@ matrix:
7293
- libc++-dev
7394
- libc++abi-dev
7495
env:
75-
- COMPILER=clang++-3.7
96+
- CC=clang-3.7
97+
- CXX=clang++-3.7
7698
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
7799
- compiler: clang
78100
addons:
@@ -85,7 +107,8 @@ matrix:
85107
- libc++-dev
86108
- libc++abi-dev
87109
env:
88-
- COMPILER=clang++-3.8
110+
- CC=clang-3.8
111+
- CXX=clang++-3.8
89112
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
90113
- compiler: clang
91114
addons:
@@ -98,7 +121,8 @@ matrix:
98121
- libc++-dev
99122
- libc++abi-dev
100123
env:
101-
- COMPILER=clang++-3.9
124+
- CC=clang-3.9
125+
- CXX=clang++-3.9
102126
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
103127
- compiler: clang
104128
addons:
@@ -111,49 +135,85 @@ matrix:
111135
- libc++-dev
112136
- libc++abi-dev
113137
env:
114-
- COMPILER=clang++-4.0
138+
- CC=clang-4.0
139+
- CXX=clang++-4.0
115140
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
116141
- compiler: clang
117142
addons:
118143
apt:
119144
sources:
120145
- ubuntu-toolchain-r-test
121-
- llvm-toolchain-trusty-5.0
146+
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main'
147+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
122148
packages:
123149
- clang-5.0
124-
- libc++-dev
125-
- libc++abi-dev
126150
env:
127-
- COMPILER=clang++-5.0
128-
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
151+
- CC=clang-5.0
152+
- CXX=clang++-5.0
129153
- compiler: clang
130154
addons:
131155
apt:
132156
sources:
133157
- ubuntu-toolchain-r-test
134-
- llvm-toolchain-trusty-6.0
158+
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main'
159+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
135160
packages:
136161
- clang-6.0
137-
- libc++-dev
138-
- libc++abi-dev
139162
env:
140-
- COMPILER=clang++-6.0
141-
- CMAKE_FLAGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-lc++"
163+
- CC=clang-6.0
164+
- CXX=clang++-6.0
165+
- compiler: clang
166+
addons:
167+
apt:
168+
sources:
169+
- ubuntu-toolchain-r-test
170+
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
171+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
172+
packages:
173+
- clang-7
174+
env:
175+
- CC=clang-7
176+
- CXX=clang++-7
177+
- compiler: clang
178+
addons:
179+
apt:
180+
sources:
181+
- ubuntu-toolchain-r-test
182+
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
183+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
184+
packages:
185+
- clang-8
186+
env:
187+
- CC=clang-8
188+
- CXX=clang++-8
189+
- compiler: clang
190+
addons:
191+
apt:
192+
sources:
193+
- ubuntu-toolchain-r-test
194+
- sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
195+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
196+
packages:
197+
- clang-9
198+
env:
199+
- CC=clang-9
200+
- CXX=clang++-9
142201

143202
script:
144203
- uname -a
145204
- cmake --version
146-
- $COMPILER --version
205+
- $CC --version
206+
- $CXX --version
147207

148208
- mkdir bin_noexcept
149209
- cd bin_noexcept
150-
- cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_CXX_COMPILER=$COMPILER -DPROGRAMOPTIONS_BUILD_TEST=OFF -DPROGRAMOPTIONS_NO_EXCEPTIONS=ON
210+
- cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DPROGRAMOPTIONS_BUILD_TEST=OFF -DPROGRAMOPTIONS_NO_EXCEPTIONS=ON
151211
- cmake --build .
152212
- cd ..
153213

154214
- mkdir bin
155215
- cd bin
156-
- cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_CXX_COMPILER=$COMPILER
216+
- cmake .. $CMAKE_FLAGS -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX
157217
- cmake --build .
158218

159219
- ./Test

0 commit comments

Comments
 (0)