From 7086cf6514462512ffcca6cb72876bd76b193cab Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Mar 2019 00:31:29 +0000 Subject: Build OLA plugin too --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1b7c2e2..7ad9dc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ addons: - *base_build - libasound2-dev - libevdev-dev + - libola-dev packages: &core_build_gpp_latest - *core_build - gcc-8 -- cgit v1.2.3 From c7593145d9d71733ea6a0b32bcd52dd21b3242b8 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Mar 2019 00:32:23 +0000 Subject: Actually build the OLA plugin --- .travis-ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From d4663f39bf3272316d5c9e8480e981f54d4f48fb Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Mar 2019 00:44:19 +0000 Subject: Install the ola libs on Mac, use the latest C++ compiler too --- .travis.yml | 9 +++++---- 1 file 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: -- cgit v1.2.3 From 558a4b135cfbc9e72648cfbbc402dde22a36d632 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Mar 2019 01:02:43 +0000 Subject: Install g++8 too, for the C++ compiles --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e01cb2a..df4a97a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ addons: packages: &core_build_gpp_latest - *core_build - gcc-8 + - g++-8 packages: &core_build_clang_latest - *core_build - clang-6.0 @@ -165,7 +166,8 @@ before_install: - 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 +#OS X uses something other than $CXX variable + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; 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: -- cgit v1.2.3 From d682a8df9a151538d70c8a7a23a68636284b1b94 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 26 Mar 2019 01:18:38 +0000 Subject: Only run $CXX version when necessary --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df4a97a..ab047ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,7 +167,7 @@ before_install: #Report the compiler versions - $CC --version #OS X uses something other than $CXX variable - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then $CXX --version; fi + - 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: -- cgit v1.2.3