diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 22:08:25 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-05-30 22:08:35 +0300 |
| commit | bda06cee127dfcfe76063d6e753885335e53f8e2 (patch) | |
| tree | 2ac03e1a600f3c2102274aa4e3f1b1148dba0948 /.travis.yml | |
| parent | 71f18226d1997a12009e3b17a0a84d45f1d25fae (diff) | |
| download | meson-bda06cee127dfcfe76063d6e753885335e53f8e2.zip meson-bda06cee127dfcfe76063d6e753885335e53f8e2.tar.gz meson-bda06cee127dfcfe76063d6e753885335e53f8e2.tar.bz2 | |
Added OSX support for Travis.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 8b13401..27e3b2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,26 @@ sudo: required -language: c +os: + - linux + - osx + +language: + - cpp services: - docker before_install: - - docker pull jpakkane/mesonci:xenial + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:xenial; fi -# We need to copy the current checkout inside the container, +# We need to copy the current checkout inside the Docker container, # because it has the MR id to be tested checked out. script: - - echo FROM jpakkane/mesonci:xenial > Dockerfile - - echo ADD . /root >> Dockerfile - - docker build -t withgit . - - docker run withgit /bin/sh -c "cd /root && ./run_tests.py" + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:xenial > 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 && ./run_tests.py"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./run_tests.py ; fi |