Skip to content

Commit b5aee97

Browse files
committed
Update to xenial in travis
1 parent 36602e5 commit b5aee97

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.travis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
language: none
1+
language: cpp
22

33
matrix:
44
include:
55
- os: linux
6-
dist: trusty
6+
dist: xenial
7+
sudo: false
78
compiler: clang
8-
env: CXX=clang++-3.8 CC=clang-3.8
9+
env: CXX=clang++-7 CC=clang-7 QT=511
910
addons:
1011
apt:
1112
sources:
12-
- ubuntu-toolchain-r-test
13-
- llvm-toolchain-precise-3.8
13+
- llvm-toolchain-xenial-7
1414
packages:
15-
- clang-3.8
16-
# VERY IMPORTANT TO INSTALL g++-5! clang doesn't come with a standard library, so
17-
# we need to install g++-5 for a C++14 standard library.
18-
- g++-5
15+
- clang-7
1916

2017
- os: linux
21-
dist: trusty
18+
dist: xenial
19+
sudo: false
2220
compiler: gcc
23-
env: CXX=g++-5 CC=gcc-5 QT=5
21+
env: CXX=g++-7 CC=gcc-7 QT=511
2422
addons:
2523
apt:
2624
sources:
2725
- ubuntu-toolchain-r-test
2826
packages:
29-
- g++-5
27+
- g++-7
3028

3129
- os: osx
3230
osx_image: xcode8.3
@@ -41,7 +39,9 @@ before_install:
4139
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
4240
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
4341
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install build-essential libgl1-mesa-dev ; fi
44-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -yy install qtbase5-dev ; fi
42+
- if [[ "$QT" == "511" ]]; then sudo add-apt-repository ppa:beineri/opt-qt-5.11.2-xenial -y; fi
43+
- if [[ "$QT" == "511" ]]; then sudo apt-get update -qq; fi
44+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -yqq install qt511base; source /opt/qt511/bin/qt511-env.sh; fi
4545

4646
script:
4747
- mkdir build

0 commit comments

Comments
 (0)