Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 46 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,66 +10,80 @@ env:

matrix:
include:
# linux with gcc 8
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-8
dist: trusty
env:
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
# linux with gcc 7
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
install:
- gcc-7
packages:
- g++-7
dist: trusty
env:
- MATRIX_EVAL="CC=gcc-7 CXX=g++-7"
compiler: gcc
# linux with gcc 6
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
# linux with clang 7
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
install:
- gcc-6
- llvm-toolchain-trusty-7
packages:
- clang-7
dist: trusty
env:
- MATRIX_EVAL="CC=gcc-6 CXX=g++-6"
compiler: gcc
# linux with gcc (default)
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7 && COMPILE_ASIO=1"
# linux with clang 6.0
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
packages:
- clang-6.0
dist: trusty
compiler: gcc
# linux with clang (default)
env:
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0 && COMPILE_ASIO=1"
# linux with clang 5.0
- os: linux
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
packages:
- clang-5.0
dist: trusty
env:
- MATRIX_EVAL="COMPILE_ASIO=1"
compiler: clang
# linux with clang 3.8
- MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && COMPILE_ASIO=1"
# linux with clang 4.0
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
install:
- clang-3.8
- llvm-toolchain-trusty-4.0
packages:
- clang-4.0
dist: trusty
env:
- MATRIX_EVAL="CC=clang-3.8 CXX=clang++-3.8 COMPILE_ASIO=1"
compiler: clang
# osx with xcode9.2/gcc
- os: osx
osx_image: xcode9.2
compiler: gcc
# osx with xcode9.2/clang
- os: osx
osx_image: xcode9.2
compiler: clang
# osx with xcode/gcc (default)
- MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0 && COMPILE_ASIO=1"
# osx with xcode10.1/clang
- os: osx
compiler: gcc
# osx with xcode/clang (default)
osx_image: xcode10.1
# osx with xcode9.4/clang
- os: osx
compiler: clang
osx_image: xcode9.4

before_install:
- eval "${MATRIX_EVAL}"
Expand Down
13 changes: 0 additions & 13 deletions ci/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ fi
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
# autotools, automake, make are present in the trusty image
sudo apt-get install -y \
g++ \
libasio-dev \
qt5-default \
libecasoundc-dev \
Expand All @@ -37,18 +36,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
jackd1 \
pkg-config \
libtool
# force installation of gcc-6 if required
if [ "${CC}" == "gcc-6" ]; then
sudo apt-get install gcc-6 g++-6
fi
# force installation of gcc-7 if required
if [ "${CC}" == "gcc-7" ]; then
sudo apt-get install gcc-7 g++-7
fi
# force installation of clang-3.8 if required
if [ "${CC}" == "clang-3.8" ]; then
sudo apt-get install clang-3.8
fi

# force qt 5
export QT_SELECT=qt5
Expand Down