diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-03-29 01:51:06 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-03-29 01:51:06 +0300 |
| commit | 5db8665e9d7aa4960d3c7a7a9b0466f8fee04a1c (patch) | |
| tree | b28219c4bd9e98c299d766f0adbb6e101120c991 /.travis.yml | |
| parent | 8dd4b1091612e2a577ceea4292b5eaa3ab313825 (diff) | |
travis-ci: add macOS target.
This commit adds a Homebrew-based macOS build to our Travis CI build
matrix.
It also cleans up the exising build matrix such such that Linux builds
are built only on Linux hosts, and macOS builds are only built on macOS
hosts.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 8b4d019f8..0aba69261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,33 @@ dist: trusty language: cpp compiler: gcc +os: + - linux + - osx + env: - matrix: - - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 - - MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 - - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 + - MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu + - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu + - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 + - MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 + - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 + - MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin + +matrix: + exclude: + - os: linux + env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-apple-darwin + - os: osx + env: MUMBLE_QT=qt4 MUMBLE_HOST=x86_64-linux-gnu + - os: osx + env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu + - os: osx + env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-linux-gnu MUMBLE_NO_PCH=1 + - os: osx + env: MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 + - os: osx + env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 + allow_failures: - env: MUMBLE_QT=qt5 MUMBLE_HOST=i686-w64-mingw32 - env: MUMBLE_QT=qt5 MUMBLE_HOST=x86_64-w64-mingw32 |