Skip to content

Commit b2b8a74

Browse files
committed
Change linux images on travis
Remove deprecated PPAs and switch to distros that provide the compilers we want
1 parent 0b77cc2 commit b2b8a74

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

.travis.yml

+9-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
language: cpp
44
sudo: required
5-
dist: trusty
65
branches:
76
only:
87
- master
@@ -38,6 +37,7 @@ matrix:
3837

3938
# Linux with Clang 3.6, 64-bit Debug, Alsa
4039
- os: linux
40+
dist: trusty
4141
compiler: clang
4242
addons:
4343
apt:
@@ -47,36 +47,27 @@ matrix:
4747

4848
# Linux with Clang 3.6, 64-bit Release, Jack
4949
- os: linux
50+
dist: trusty
5051
compiler: clang
5152
addons:
5253
apt:
53-
sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
54+
sources: ['ubuntu-toolchain-r-test']
5455
packages: ['clang-3.8', 'g++-5', 'valgrind', 'portaudio19-dev']
5556
env: COMPILER=clang++-3.8 WORDSIZE=64 CONFIGURATION=Release AUDIO=Jack
5657

5758
# Linux with Clang 5.0, 64-bit Debug, Alsa
5859
- os: linux
60+
dist: bionic
5961
compiler: clang
6062
addons:
6163
apt:
62-
sources: ['llvm-toolchain-trusty-5.0', 'ubuntu-toolchain-r-test']
64+
sources: ['ubuntu-toolchain-r-test']
6365
packages: ['clang-5.0', 'g++-5', 'valgrind', 'portaudio19-dev']
6466
env: COMPILER=clang++-5.0 WORDSIZE=64 CONFIGURATION=Debug AUDIO=Alsa
6567

66-
# Linux with GCC 5.x, 32-bit Release
67-
# - os: linux
68-
# compiler: gcc
69-
# addons:
70-
# apt:
71-
# sources: ['ubuntu-toolchain-r-test']
72-
# packages: ['g++-5', 'g++-5-multilib', 'linux-libc-dev:i386', 'valgrind:i386',
73-
# 'libxext-dev:i386', 'libglapi-mesa:i386',
74-
# 'libgl1-mesa-glx:i386', 'libgl1-mesa-dev:i386',
75-
# 'portaudio19-dev:i386', 'libglib2.0-0:i386']
76-
# env: COMPILER=g++-5 WORDSIZE=32 CONFIGURATION=Release
77-
7868
# Linux with GCC 5.x, 64-bit Release, Alsa
7969
- os: linux
70+
dist: bionic
8071
compiler: gcc
8172
addons:
8273
apt:
@@ -86,6 +77,7 @@ matrix:
8677

8778
# Linux with GCC 6.x, 64-bit Release, Alsa
8879
- os: linux
80+
dist: bionic
8981
compiler: gcc
9082
addons:
9183
apt:
@@ -95,6 +87,7 @@ matrix:
9587

9688
# ESP32
9789
- os: linux
90+
dist: bionic
9891
compiler: clang
9992
addons:
10093
apt:
@@ -104,6 +97,7 @@ matrix:
10497

10598
# Code formatting verification
10699
- os: linux
100+
dist: bionic
107101
compiler: clang
108102
env: CONFIGURATION=Formatting LLVM_VERSION=6.0
109103
services:

0 commit comments

Comments
 (0)