Skip to content

Commit

Permalink
ci: use trusty for travis. add gcc
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Dec 9, 2015
1 parent 8ed20bb commit 86a7dc8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 28 deletions.
53 changes: 29 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,43 @@
os:
- osx
- linux

dist: trusty
#TODO: mingw cross build
language: cpp
compiler:
- clang
cache: apt
env:
- QT=4.8.6 AV=ffmpeg-1.0.10
- QT=5.0.2 AV=ffmpeg-1.2.10
- QT=5.1.1 AV=ffmpeg-2.0.6
- QT=5.2.1 AV=ffmpeg-2.2.11
- QT=brew AV=ffmpeg-brew


matrix:
exclude:
- os: linux
env: QT=brew AV=ffmpeg-brew
- os: osx
env: QT=4.8.6 AV=ffmpeg-1.0.10
- os: osx
env: QT=5.0.2 AV=ffmpeg-1.2.10
include:
- os: osx
env: QT=5.1.1 AV=ffmpeg-2.0.6
- os: osx
env: QT=5.2.1 AV=ffmpeg-2.2.11
compiler: clang
env:
- QT=brew
- AV=ffmpeg-brew
- os: linux
compiler: gcc
env:
- QT=4.8.6
- AV=ffmpeg-1.0.10
- CC=gcc
- os: linux
compiler: clang
env:
- QT=5.0.2
- AV=ffmpeg-1.2.10
- os: linux
compiler: clang
env:
- QT=5.1.1
- AV=ffmpeg-2.0.6
- os: linux
compiler: clang
env:
- QT=5.2.1
- AV=ffmpeg-2.2.11

branches:
only:
- master
- prelease
- ci/travis
- /^travis-.*$/
- /^travis.*$/
- dev

git:
Expand Down
8 changes: 4 additions & 4 deletions tools/ci/linux/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ cat /etc/issue
echo "QtAV build script for travis-ci"

jobs=`cat /proc/cpuinfo |grep 'cpu cores' |wc -l`


cd $QTAV_OUT

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

cd $TRAVIS_BUILD_DIR

0 comments on commit 86a7dc8

Please sign in to comment.