Skip to content

Commit 2f48cdc

Browse files
committed
TST: Upgrade to Ubuntu Xenial on Travis-CI
Also: * Remove xcode9.4 build from Travis-CI ... because it doesn't support std::optional * Remove clang 5 (testing 2 versions seems sufficient)
1 parent 6a67d65 commit 2f48cdc

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

.travis.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: cpp
22
sudo: required
3+
dist: xenial
34

45
git:
56
depth: 3
@@ -18,7 +19,6 @@ matrix:
1819
- ubuntu-toolchain-r-test
1920
packages:
2021
- g++-8
21-
dist: trusty
2222
env:
2323
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
2424
# linux with gcc 7
@@ -29,54 +29,35 @@ matrix:
2929
- ubuntu-toolchain-r-test
3030
packages:
3131
- g++-7
32-
dist: trusty
3332
env:
3433
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
3534
# linux with clang 7
3635
- os: linux
3736
addons:
3837
apt:
3938
sources:
40-
- ubuntu-toolchain-r-test # only needed for <= trusty
41-
- llvm-toolchain-trusty-7
39+
- ubuntu-toolchain-r-test # for libstdc++
40+
- llvm-toolchain-xenial-7
4241
packages:
4342
- clang-7
44-
- libstdc++-8-dev # only needed for <= trusty
45-
dist: trusty
43+
- libstdc++-8-dev
4644
env:
4745
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7 && COMPILE_ASIO=1"
4846
# linux with clang 6.0
4947
- os: linux
5048
addons:
5149
apt:
5250
sources:
53-
- ubuntu-toolchain-r-test # only needed for <= trusty
54-
- llvm-toolchain-trusty-6.0
51+
- ubuntu-toolchain-r-test # for libstdc++
52+
- llvm-toolchain-xenial-6.0
5553
packages:
5654
- clang-6.0
57-
- libstdc++-8-dev # only needed for <= trusty
58-
dist: trusty
55+
- libstdc++-8-dev
5956
env:
6057
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0 && COMPILE_ASIO=1"
61-
# linux with clang 5.0
62-
- os: linux
63-
addons:
64-
apt:
65-
sources:
66-
- ubuntu-toolchain-r-test # only needed for <= trusty
67-
- llvm-toolchain-trusty-5.0
68-
packages:
69-
- clang-5.0
70-
- libstdc++-7-dev # only needed for <= trusty
71-
dist: trusty
72-
env:
73-
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && COMPILE_ASIO=1"
7458
# osx with xcode10.1/clang
7559
- os: osx
7660
osx_image: xcode10.1
77-
# osx with xcode9.4/clang
78-
- os: osx
79-
osx_image: xcode9.4
8061

8162
before_install:
8263
- eval "${MATRIX_EVAL}"

ci/install-deps.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
2424
sudo apt-get install -y \
2525
libasio-dev \
2626
qt5-default \
27+
libqt5opengl5-dev \
2728
libecasoundc-dev \
2829
doxygen \
2930
ecasound \

0 commit comments

Comments
 (0)