From 65a9139ffefaf573794375aa46ca3f71d561561e Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Wed, 24 Oct 2018 19:39:32 +0200 Subject: [PATCH] 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. --- .travis.yml | 6 +++--- CI/install-dependencies-macos.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee1fcffe..a8a74aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CI/install-dependencies-macos.sh b/CI/install-dependencies-macos.sh index 6a767511..cd471447 100755 --- a/CI/install-dependencies-macos.sh +++ b/CI/install-dependencies-macos.sh @@ -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 =!=