Skip to content

Commit 4d4870a

Browse files
committed
TST: Update GCC, clang and Xcode versions on Travis-CI
1 parent b206848 commit 4d4870a

File tree

2 files changed

+46
-45
lines changed

2 files changed

+46
-45
lines changed

.travis.yml

Lines changed: 46 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,66 +10,80 @@ env:
1010

1111
matrix:
1212
include:
13+
# linux with gcc 8
14+
- os: linux
15+
addons:
16+
apt:
17+
sources:
18+
- ubuntu-toolchain-r-test
19+
packages:
20+
- g++-8
21+
dist: trusty
22+
env:
23+
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
1324
# linux with gcc 7
1425
- os: linux
1526
addons:
1627
apt:
1728
sources:
1829
- ubuntu-toolchain-r-test
19-
install:
20-
- gcc-7
30+
packages:
31+
- g++-7
2132
dist: trusty
2233
env:
23-
- MATRIX_EVAL="CC=gcc-7 CXX=g++-7"
24-
compiler: gcc
25-
# linux with gcc 6
34+
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
35+
# linux with clang 7
2636
- os: linux
2737
addons:
2838
apt:
2939
sources:
3040
- ubuntu-toolchain-r-test
31-
install:
32-
- gcc-6
41+
- llvm-toolchain-trusty-7
42+
packages:
43+
- clang-7
3344
dist: trusty
3445
env:
35-
- MATRIX_EVAL="CC=gcc-6 CXX=g++-6"
36-
compiler: gcc
37-
# linux with gcc (default)
46+
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7 && COMPILE_ASIO=1"
47+
# linux with clang 6.0
3848
- os: linux
49+
addons:
50+
apt:
51+
sources:
52+
- ubuntu-toolchain-r-test
53+
- llvm-toolchain-trusty-6.0
54+
packages:
55+
- clang-6.0
3956
dist: trusty
40-
compiler: gcc
41-
# linux with clang (default)
57+
env:
58+
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0 && COMPILE_ASIO=1"
59+
# linux with clang 5.0
4260
- os: linux
61+
addons:
62+
apt:
63+
sources:
64+
- llvm-toolchain-trusty-5.0
65+
packages:
66+
- clang-5.0
4367
dist: trusty
4468
env:
45-
- MATRIX_EVAL="COMPILE_ASIO=1"
46-
compiler: clang
47-
# linux with clang 3.8
69+
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && COMPILE_ASIO=1"
70+
# linux with clang 4.0
4871
- os: linux
4972
addons:
5073
apt:
5174
sources:
52-
- ubuntu-toolchain-r-test
53-
install:
54-
- clang-3.8
75+
- llvm-toolchain-trusty-4.0
76+
packages:
77+
- clang-4.0
5578
dist: trusty
5679
env:
57-
- MATRIX_EVAL="CC=clang-3.8 CXX=clang++-3.8 COMPILE_ASIO=1"
58-
compiler: clang
59-
# osx with xcode9.2/gcc
60-
- os: osx
61-
osx_image: xcode9.2
62-
compiler: gcc
63-
# osx with xcode9.2/clang
64-
- os: osx
65-
osx_image: xcode9.2
66-
compiler: clang
67-
# osx with xcode/gcc (default)
80+
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0 && COMPILE_ASIO=1"
81+
# osx with xcode10.1/clang
6882
- os: osx
69-
compiler: gcc
70-
# osx with xcode/clang (default)
83+
osx_image: xcode10.1
84+
# osx with xcode9.4/clang
7185
- os: osx
72-
compiler: clang
86+
osx_image: xcode9.4
7387

7488
before_install:
7589
- eval "${MATRIX_EVAL}"

ci/install-deps.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ fi
2222
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
2323
# autotools, automake, make are present in the trusty image
2424
sudo apt-get install -y \
25-
g++ \
2625
libasio-dev \
2726
qt5-default \
2827
libecasoundc-dev \
@@ -37,18 +36,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
3736
jackd1 \
3837
pkg-config \
3938
libtool
40-
# force installation of gcc-6 if required
41-
if [ "${CC}" == "gcc-6" ]; then
42-
sudo apt-get install gcc-6 g++-6
43-
fi
44-
# force installation of gcc-7 if required
45-
if [ "${CC}" == "gcc-7" ]; then
46-
sudo apt-get install gcc-7 g++-7
47-
fi
48-
# force installation of clang-3.8 if required
49-
if [ "${CC}" == "clang-3.8" ]; then
50-
sudo apt-get install clang-3.8
51-
fi
5239

5340
# force qt 5
5441
export QT_SELECT=qt5

0 commit comments

Comments
 (0)