Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up macOS builds using more recent CI osx-image / Homebrew #453

Merged
merged 8 commits into from
Sep 27, 2020
Merged

Speed up macOS builds using more recent CI osx-image / Homebrew #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0717c2b
CI: Use Travis Homebrew addons instead install script
redtide Sep 27, 2020
4ada41d
CI: Update osx image, disable cache
redtide Sep 27, 2020
d6dcead
Add libsndfile to sfizz_jack client link options
redtide Sep 27, 2020
494ce78
Add sfizz_jack link dirs
redtide Sep 27, 2020
6780431
CI: Remove osx opt symlink
redtide Sep 27, 2020
7b294b7
Typo in sfizz_jack CMakeLists
redtide Sep 27, 2020
471a9ca
sfizz_jack: fix link_directories() in CMakeLists
redtide Sep 27, 2020
85e3081
CI: forget about Homebrew cache [ci skip]
redtide Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ dist: bionic
cache:
directories:
- vst/download/
# macOS Homebrew
- $HOME/Library/Caches/Homebrew
- /usr/local/Homebrew

jobs:
include:
Expand Down Expand Up @@ -46,16 +43,18 @@ jobs:
- name: "macOS"
stage: "Build"
os: osx
osx_image: xcode11.3
addons:
homebrew:
packages:
- cmake
- libsndfile
- jack
- 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:
- 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:
Expand Down
11 changes: 0 additions & 11 deletions .travis/install_osx.sh
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion clients/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +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 jack absl::flags_parse ${JACK_LIBRARIES})
target_link_libraries (sfizz_jack PRIVATE sfizz::sfizz 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)
Expand Down