Skip to content

Commit 587ff53

Browse files
Update Travis CI to Ubuntu Xenial
This updates to Qt 5.12, since Stephan has a build for that in his PPA. But we need to turn off RDRNAD support for the Valgrind build, as it doesn't understand that instruction. This also downgrades GCC to 5.4, which is what comes by default with Travis CI. Signed-off-by: Thiago Macieira <[email protected]>
1 parent d75f2eb commit 587ff53

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.travis.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,46 @@ language: cpp
22
matrix:
33
include:
44
- os: linux
5+
dist: xenial
56
addons:
67
apt:
78
sources:
8-
- ubuntu-toolchain-r-test
9-
- sourceline: 'ppa:beineri/opt-qt596-trusty'
9+
- sourceline: 'ppa:beineri/opt-qt-5.12.1-xenial'
1010
packages:
11-
- qt59base valgrind
12-
- g++-7
11+
- qt512base valgrind
1312
- doxygen
1413
env:
1514
- QMAKESPEC=linux-g++
16-
- EVAL="CC=gcc-7 && CXX=g++-7"
15+
- EVAL="CC=gcc && CXX=g++"
1716
- CFLAGS="-Os"
1817
- LDFLAGS="-Wl,--no-undefined -lm"
1918
- QMAKEFLAGS="-config release"
19+
- QT_NO_CPU_FEATURE=rdrnd
2020
- os: linux
21+
dist: xenial
2122
addons:
2223
apt:
2324
sources:
24-
- ubuntu-toolchain-r-test
25-
- sourceline: 'ppa:beineri/opt-qt596-trusty'
25+
- sourceline: 'ppa:beineri/opt-qt-5.12.1-xenial'
2626
packages:
27-
- qt59base
27+
- qt512base
2828
env:
2929
- QMAKESPEC=linux-clang
30-
- EVAL="CC=clang-5.0 && CXX=clang++"
31-
- PATH=$PATH:/usr/local/clang/bin
30+
- EVAL="CC=clang && CXX=clang++"
3231
- CFLAGS="-Oz"
3332
- LDFLAGS="-Wl,--no-undefined -lm"
3433
- QMAKEFLAGS="-config release"
3534
- MAKEFLAGS=-s
3635
- TESTARGS=-silent
3736
- os: linux
37+
dist: xenial
3838
env:
3939
- QMAKESPEC=linux-gcc-freestanding
4040
- EVAL="CXX=false"
4141
- CFLAGS="-ffreestanding -Os"
4242
- LDFLAGS="-Wl,--no-undefined -lm"
4343
- os: linux
44+
dist: xenial
4445
env:
4546
- QMAKESPEC=linux-gcc-no-math
4647
- EVAL="CXX=false && touch src/math.h src/float.h"

0 commit comments

Comments
 (0)