diff options
| author | Peter Newman <peternewman@users.noreply.github.com> | 2019-03-26 00:44:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 00:44:19 +0000 |
| commit | d4663f39bf3272316d5c9e8480e981f54d4f48fb (patch) | |
| tree | b581cefeadac0d6c76a93ea4bb069f24d2408a46 | |
| parent | c7593145d9d71733ea6a0b32bcd52dd21b3242b8 (diff) | |
| download | midimonster-d4663f39bf3272316d5c9e8480e981f54d4f48fb.tar.gz midimonster-d4663f39bf3272316d5c9e8480e981f54d4f48fb.tar.bz2 midimonster-d4663f39bf3272316d5c9e8480e981f54d4f48fb.zip | |
Install the ola libs on Mac, use the latest C++ compiler too
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7ad9dc3..e01cb2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -157,14 +157,15 @@ install: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too #Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that - - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; fi + - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; export CXX="ccache g++-8"; fi #Use the latest clang if we're compiling with clang - - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" = "clang" ]; then export CC="clang-6.0"; fi -#Report the compiler version + - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CC" = "clang" ]; then export CC="clang-6.0"; export CXX="clang-6.0"; fi +#Report the compiler versions - $CC --version + - $CXX --version - if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then wget "http://archive.ubuntu.com/ubuntu/pool/main/l/lintian/lintian_2.5.104_all.deb"; sudo dpkg -i lintian_*.deb; sudo apt-get install -f -y; fi # Install a later lintian after_script: |