mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
Fixes Travis builds for macOS
Switching to Xcode 9.4 achieves parity with obs-studio. Also QT 5.10.1 is not available as a bottle for Sierra anymore, which leads to Travis building qt from sources. By enabling output of the qt install step, the "missing output" timeout in Travis should be fixed as well, once qt is not available for High Sieera anymore.
This commit is contained in:
@ -34,12 +34,12 @@ matrix:
|
||||
|
||||
- os: osx
|
||||
env: _macos_build
|
||||
osx_image: xcode8.3
|
||||
osx_image: xcode9.4
|
||||
before_install:
|
||||
- "./CI/install-dependencies-macos.sh"
|
||||
- "./CI/install-build-obs-macos.sh"
|
||||
script: "./CI/build-macos.sh"
|
||||
after_success:
|
||||
after_success:
|
||||
- ./CI/package-macos.sh
|
||||
|
||||
deploy:
|
||||
@ -53,7 +53,7 @@ deploy:
|
||||
acl: public_read
|
||||
on:
|
||||
repo: Palakis/obs-websocket
|
||||
condition:
|
||||
condition:
|
||||
- "$TRAVIS_OS_NAME = linux"
|
||||
- "-d /home/travis/package"
|
||||
all_branches: true
|
||||
|
@ -39,11 +39,11 @@ echo "[obs-websocket] Installing obs-websocket dependency 'QT 5.10.1'.."
|
||||
# Pouring from the bottle is much quicker though, so use bottle for now.
|
||||
# =!= NOTICE =!=
|
||||
|
||||
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9a70413d137839de0054571e5f85fd07ee400955/Formula/qt.rb 2>/dev/null
|
||||
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/9a70413d137839de0054571e5f85fd07ee400955/Formula/qt.rb
|
||||
|
||||
# Pin this version of QT5 to avoid `brew upgrade`
|
||||
# upgrading it to incompatible version
|
||||
brew pin qt 2>/dev/null
|
||||
brew pin qt
|
||||
|
||||
# Fetch and install Packages app
|
||||
# =!= NOTICE =!=
|
||||
|
Reference in New Issue
Block a user