From 0717c2b15df01ef8b58524b3be7a7ff322d09af8 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 19:03:16 +0200 Subject: [PATCH 1/8] CI: Use Travis Homebrew addons instead install script --- .travis.yml | 7 +++++++ .travis/install_osx.sh | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c2e722b6..128f0d632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,13 @@ jobs: - name: "macOS" stage: "Build" os: osx + addons: + homebrew: + packages: + - cmake + - libsndfile + - jack + - dylibbundler env: - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" install: .travis/install_osx.sh diff --git a/.travis/install_osx.sh b/.travis/install_osx.sh index 466556d79..64097a263 100755 --- a/.travis/install_osx.sh +++ b/.travis/install_osx.sh @@ -3,9 +3,3 @@ set -ex sudo ln -s /usr/local /opt/local -brew cask uninstall --force java -brew update -brew upgrade cmake -brew install python || brew link --overwrite python -brew install jack -brew install dylibbundler From 4ada41d54a03b0f900b4e40daab999e22d242290 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 19:37:58 +0200 Subject: [PATCH 2/8] CI: Update osx image, disable cache --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 128f0d632..070198510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ cache: directories: - vst/download/ # macOS Homebrew - - $HOME/Library/Caches/Homebrew - - /usr/local/Homebrew +# - $HOME/Library/Caches/Homebrew +# - /usr/local/Homebrew jobs: include: @@ -46,6 +46,7 @@ jobs: - name: "macOS" stage: "Build" os: osx + osx_image: xcode11.3 addons: homebrew: packages: @@ -58,11 +59,11 @@ jobs: install: .travis/install_osx.sh script: .travis/script_osx.sh after_success: .travis/prepare_osx.sh - before_cache: - - brew cleanup +# before_cache: +# - brew cleanup # Credit https://discourse.brew.sh/t/best-practice-for-homebrew-on-travis-brew-update-is-5min-to-build-time/5215/9 # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build - - find /usr/local/Homebrew \! -regex ".+\.git.+" -delete +# - find /usr/local/Homebrew \! -regex ".+\.git.+" -delete - name: "MOD devices arm" env: From d6dcead9158bc4b0dfc42ee160fbad1d1ac3b948 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 19:59:01 +0200 Subject: [PATCH 3/8] Add libsndfile to sfizz_jack client link options --- clients/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 859005c08..b3fb981ac 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -6,7 +6,7 @@ if (SFIZZ_JACK) add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) - target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse ${JACK_LIBRARIES}) + target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) sfizz_enable_lto_if_needed (sfizz_jack) install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "jack" OPTIONAL) From 494ce78a586f8a4d400a293ad8b42ebe27cabc06 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 20:12:12 +0200 Subject: [PATCH 4/8] Add sfizz_jack link dirs --- clients/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index b3fb981ac..b7628dc41 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -7,6 +7,7 @@ if (SFIZZ_JACK) add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) + link_directories (${JACK_LIBRARY_DIRS}) sfizz_enable_lto_if_needed (sfizz_jack) install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "jack" OPTIONAL) From 67804314fe0dd6bb87985c967009a118417b17f4 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 20:30:48 +0200 Subject: [PATCH 5/8] CI: Remove osx opt symlink --- .travis.yml | 1 - .travis/install_osx.sh | 5 ----- 2 files changed, 6 deletions(-) delete mode 100755 .travis/install_osx.sh diff --git a/.travis.yml b/.travis.yml index 070198510..28a12a11c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,6 @@ jobs: - dylibbundler env: - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" - install: .travis/install_osx.sh script: .travis/script_osx.sh after_success: .travis/prepare_osx.sh # before_cache: diff --git a/.travis/install_osx.sh b/.travis/install_osx.sh deleted file mode 100755 index 64097a263..000000000 --- a/.travis/install_osx.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -ex - -sudo ln -s /usr/local /opt/local From 7b294b71bd639f8fd240c7a38887cee6ce1df1ba Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 20:32:05 +0200 Subject: [PATCH 6/8] Typo in sfizz_jack CMakeLists --- clients/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index b7628dc41..3e4c9322a 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -6,7 +6,7 @@ if (SFIZZ_JACK) add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) - target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz jack absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) + target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) link_directories (${JACK_LIBRARY_DIRS}) sfizz_enable_lto_if_needed (sfizz_jack) install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR} From 471a9ca615cdd3e4ce39cd83a4b2475bf03c5555 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 21:24:08 +0200 Subject: [PATCH 7/8] sfizz_jack: fix link_directories() in CMakeLists --- clients/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 3e4c9322a..9192234d5 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -3,11 +3,11 @@ project (sfizz) if (SFIZZ_JACK) find_package(PkgConfig REQUIRED) pkg_check_modules(JACK "jack" REQUIRED) + link_directories (${JACK_LIBRARY_DIRS}) add_executable (sfizz_jack MidiHelpers.h jack_client.cpp) target_include_directories (sfizz_jack PRIVATE ${JACK_INCLUDE_DIRS}) target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz absl::flags_parse sfizz-sndfile ${JACK_LIBRARIES}) - link_directories (${JACK_LIBRARY_DIRS}) sfizz_enable_lto_if_needed (sfizz_jack) install (TARGETS sfizz_jack DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "jack" OPTIONAL) From 85e3081d82f8d7a716f13a01f0f86caf89bc2075 Mon Sep 17 00:00:00 2001 From: redtide Date: Sun, 27 Sep 2020 21:45:14 +0200 Subject: [PATCH 8/8] CI: forget about Homebrew cache [ci skip] --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28a12a11c..080c1cbc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ dist: bionic cache: directories: - vst/download/ - # macOS Homebrew -# - $HOME/Library/Caches/Homebrew -# - /usr/local/Homebrew jobs: include: @@ -58,11 +55,6 @@ jobs: - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}" script: .travis/script_osx.sh after_success: .travis/prepare_osx.sh -# before_cache: -# - brew cleanup - # Credit https://discourse.brew.sh/t/best-practice-for-homebrew-on-travis-brew-update-is-5min-to-build-time/5215/9 - # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build -# - find /usr/local/Homebrew \! -regex ".+\.git.+" -delete - name: "MOD devices arm" env: