diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-06 09:10:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-06 09:10:49 -0800 |
| commit | ae8a0a1438dab3929fe21422163372925ca706b3 (patch) | |
| tree | eb52f53082d06e541db080c93e4b8658f827a11f | |
| parent | 1cf787f28182861790518eebeb550bf59b3f29cd (diff) | |
| parent | 0af99419869cf5874bad6eb4291db44d8b11b695 (diff) | |
| download | meson-ae8a0a1438dab3929fe21422163372925ca706b3.zip meson-ae8a0a1438dab3929fe21422163372925ca706b3.tar.gz meson-ae8a0a1438dab3929fe21422163372925ca706b3.tar.bz2 | |
Merge pull request #994 from centricular/more-travis-builds
travis.yml: Run tests against both gcc and clang
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index cf3a5a6..bc52ffa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,17 @@ -sudo: required +sudo: false os: - linux - osx +compiler: + - gcc + - clang + +env: + - MESON_ARGS="" + - MESON_ARGS="--unity" + language: - cpp @@ -22,5 +30,5 @@ script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:yakkety > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true ./run_tests.py"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) ./run_tests.py --backend=ninja ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true ./run_tests.py -- $MESON_ARGS"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) ./run_tests.py --backend=ninja -- $MESON_ARGS ; fi |