Skip to content

Commit 86a7dc8

Browse files
committed
ci: use trusty for travis. add gcc
1 parent 8ed20bb commit 86a7dc8

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

.travis.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
1-
os:
2-
- osx
3-
- linux
4-
1+
dist: trusty
2+
#TODO: mingw cross build
53
language: cpp
6-
compiler:
7-
- clang
84
cache: apt
9-
env:
10-
- QT=4.8.6 AV=ffmpeg-1.0.10
11-
- QT=5.0.2 AV=ffmpeg-1.2.10
12-
- QT=5.1.1 AV=ffmpeg-2.0.6
13-
- QT=5.2.1 AV=ffmpeg-2.2.11
14-
- QT=brew AV=ffmpeg-brew
15-
165

176
matrix:
18-
exclude:
19-
- os: linux
20-
env: QT=brew AV=ffmpeg-brew
21-
- os: osx
22-
env: QT=4.8.6 AV=ffmpeg-1.0.10
23-
- os: osx
24-
env: QT=5.0.2 AV=ffmpeg-1.2.10
7+
include:
258
- os: osx
26-
env: QT=5.1.1 AV=ffmpeg-2.0.6
27-
- os: osx
28-
env: QT=5.2.1 AV=ffmpeg-2.2.11
9+
compiler: clang
10+
env:
11+
- QT=brew
12+
- AV=ffmpeg-brew
13+
- os: linux
14+
compiler: gcc
15+
env:
16+
- QT=4.8.6
17+
- AV=ffmpeg-1.0.10
18+
- CC=gcc
19+
- os: linux
20+
compiler: clang
21+
env:
22+
- QT=5.0.2
23+
- AV=ffmpeg-1.2.10
24+
- os: linux
25+
compiler: clang
26+
env:
27+
- QT=5.1.1
28+
- AV=ffmpeg-2.0.6
29+
- os: linux
30+
compiler: clang
31+
env:
32+
- QT=5.2.1
33+
- AV=ffmpeg-2.2.11
2934

3035
branches:
3136
only:
3237
- master
3338
- prelease
3439
- ci/travis
35-
- /^travis-.*$/
40+
- /^travis.*$/
3641
- dev
3742

3843
git:

tools/ci/linux/script.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ cat /etc/issue
99
echo "QtAV build script for travis-ci"
1010

1111
jobs=`cat /proc/cpuinfo |grep 'cpu cores' |wc -l`
12-
13-
1412
cd $QTAV_OUT
1513

1614
rm -f build.log
1715
type -a moc
18-
qmake -r $TRAVIS_BUILD_DIR -spec linux-clang "CONFIG+=recheck"
19-
make -j$jobs
16+
SPEC=linux-clang
17+
test -n "$CC" && test "${CC/gcc/}" != "$CC" && SPEC=linux-g++
18+
qmake -r $TRAVIS_BUILD_DIR -spec $SPEC "CONFIG+=recheck"
19+
make -j$((jobs+1))
2020

2121
cd $TRAVIS_BUILD_DIR

0 commit comments

Comments
 (0)