diff options
| author | h.udo <hudokkow@gmail.com> | 2016-02-11 10:45:29 +0000 |
|---|---|---|
| committer | h.udo <hudokkow@gmail.com> | 2016-02-11 18:25:19 +0000 |
| commit | 611c0e9a6b2d4af9e8bffbec7ce4cfc184c54fcf (patch) | |
| tree | a37bc7e5ba341b049d915b12688e9e723b186305 /.travis.yml | |
| parent | 269a44940a55d1680e9c3f19c66f9286eac560be (diff) | |
Add clang builds and fix python problem
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index eeda67f06e..e1ee30f3ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,11 @@ # Kodi's travis-ci.org integration file -# NOTES: -# The travis-ci Gods have environmental concerns with verbosity and clang/xcode builds. -# A nice message is presented in such cases: -# "The log length has exceeded the limit of 4 MB (this usually means that the test suite is raising the -# same exception over and over). The job has been terminated" -# -# travis-ci has a problem with python 2.7 (see https://github.com/travis-ci/travis-ci/issues/4948) so we mark -# used language as 'generic' to work around it - # TODO: # integrate with slack # make it perfect... or not ;-r -language: generic +language: cpp # Define the build matrix # @@ -24,7 +15,9 @@ language: generic os: linux dist: trusty sudo: required -compiler: gcc +compiler: + - gcc + - clang env: - BUILD=Kodi @@ -50,6 +43,9 @@ matrix: # Prepare the system to install prerequisites or dependencies # before_install: +# Prune non-root Python from PATH. Solves https://github.com/travis-ci/travis-ci/issues/4948 +# see: https://github.com/travis-ci/travis-ci/issues/5326 + - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") # Linux # @@ -89,9 +85,14 @@ before_script: # - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" ]]; then cd $TRAVIS_BUILD_DIR/ && - ./bootstrap && + ./bootstrap; + fi + - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" && "$CXX" == "g++" ]]; then ./configure; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD" == "Kodi" && "$CXX" == "clang++" ]]; then + CXXFLAGS="-Qunused-arguments" ./configure; + fi - if [[ "$BUILD" != "Kodi" ]] && [[ "$ADDONS" == "adsp" || "$ADDONS" == "audiodecoder" || "$ADDONS" == "audioencoder" || "$ADDONS" == "pvr" || "$ADDONS" == "screensaver" || "$ADDONS" == "visualization" ]]; then cd $TRAVIS_BUILD_DIR/project/cmake/addons && |