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 /scripts/travis-ci | |
| 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 'scripts/travis-ci')
| -rwxr-xr-x | scripts/travis-ci/before_install.bash | 2 | ||||
| -rwxr-xr-x | scripts/travis-ci/script.bash | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/scripts/travis-ci/before_install.bash b/scripts/travis-ci/before_install.bash index 5df2bfe43..7e83fcfce 100755 --- a/scripts/travis-ci/before_install.bash +++ b/scripts/travis-ci/before_install.bash @@ -56,6 +56,8 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then else exit 1 fi +elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then + brew install qt5 libogg libvorbis flac libsndfile protobuf openssl ice else exit 1 fi diff --git a/scripts/travis-ci/script.bash b/scripts/travis-ci/script.bash index bbf64414e..6c73d78d9 100755 --- a/scripts/travis-ci/script.bash +++ b/scripts/travis-ci/script.bash @@ -47,6 +47,13 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then else exit 1 fi +elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl/lib/pkgconfig + export PATH=$PATH:/usr/local/opt/qt5/bin:/usr/local/bin + export MUMBLE_PREFIX=/usr/local + export MUMBLE_ICE_PREFIX=/usr/local/opt/ice + qmake CONFIG+="release tests warnings-as-errors" && make -j2 && make check else exit 1 fi |