diff options
| author | cbdev <cb@cbcdn.com> | 2019-03-26 10:07:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 10:07:47 +0100 |
| commit | 56adfff2911ef548406afe8db2841729c957f291 (patch) | |
| tree | defba2cdd559d4d83a1392244876139cf25474c3 | |
| parent | 6e8f195c36cb5f5cd6469658937336f2d31ab6e8 (diff) | |
| parent | d682a8df9a151538d70c8a7a23a68636284b1b94 (diff) | |
| download | midimonster-56adfff2911ef548406afe8db2841729c957f291.tar.gz midimonster-56adfff2911ef548406afe8db2841729c957f291.tar.bz2 midimonster-56adfff2911ef548406afe8db2841729c957f291.zip | |
Merge pull request #18 from peternewman/patch-1
Build OLA plugin on Travis too
| -rw-r--r-- | .travis-ci.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis-ci.sh b/.travis-ci.sh index b3e0744..ddfa93d 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -74,6 +74,6 @@ elif [[ $TASK = 'sanitize' ]]; then else # Otherwise compile as normal travis_fold start "make" - make; + make full; travis_fold end "make" fi diff --git a/.travis.yml b/.travis.yml index 1b7c2e2..ab047ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,11 @@ addons: - *base_build - libasound2-dev - libevdev-dev + - libola-dev packages: &core_build_gpp_latest - *core_build - gcc-8 + - g++-8 packages: &core_build_clang_latest - *core_build - clang-6.0 @@ -156,14 +158,16 @@ 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 +#OS X uses something other than $CXX variable + - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) ]; then $CXX --version; fi - 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: |