File tree 2 files changed +33
-28
lines changed
2 files changed +33
-28
lines changed Original file line number Diff line number Diff line change 1
- os :
2
- - osx
3
- - linux
4
-
1
+ dist : trusty
2
+ # TODO: mingw cross build
5
3
language : cpp
6
- compiler :
7
- - clang
8
4
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
-
16
5
17
6
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 :
25
8
- 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
29
34
30
35
branches :
31
36
only :
32
37
- master
33
38
- prelease
34
39
- ci/travis
35
- - /^travis- .*$/
40
+ - /^travis.*$/
36
41
- dev
37
42
38
43
git :
Original file line number Diff line number Diff line change @@ -9,13 +9,13 @@ cat /etc/issue
9
9
echo " QtAV build script for travis-ci"
10
10
11
11
jobs=` cat /proc/cpuinfo | grep ' cpu cores' | wc -l`
12
-
13
-
14
12
cd $QTAV_OUT
15
13
16
14
rm -f build.log
17
15
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 ))
20
20
21
21
cd $TRAVIS_BUILD_DIR
You can’t perform that action at this time.
0 commit comments