diff --git a/.travis.yml b/.travis.yml index fec94c68..ee1fcffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,9 @@ matrix: - os: osx env: _macos_build osx_image: xcode8.3 - before_install: "./CI/install-dependencies-macos.sh" + before_install: + - "./CI/install-dependencies-macos.sh" + - "./CI/install-build-obs-macos.sh" script: "./CI/build-macos.sh" after_success: - ./CI/package-macos.sh diff --git a/CI/install-build-obs-macos.sh b/CI/install-build-obs-macos.sh new file mode 100755 index 00000000..f1ef3be1 --- /dev/null +++ b/CI/install-build-obs-macos.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -ex + +# Build obs-studio +cd .. +git clone https://github.com/obsproject/obs-studio +cd obs-studio +OBSLatestTag=$(git describe --tags --abbrev=0) +git checkout $OBSLatestTag +mkdir build && cd build +cmake .. \ + -DDISABLE_PLUGINS=true \ + -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \ +&& make -j4 diff --git a/CI/install-dependencies-macos.sh b/CI/install-dependencies-macos.sh index b78194ca..cab2748a 100755 --- a/CI/install-dependencies-macos.sh +++ b/CI/install-dependencies-macos.sh @@ -12,19 +12,8 @@ brew install qt5 #echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" -# Build obs-studio -cd .. -git clone https://github.com/obsproject/obs-studio -cd obs-studio -git checkout 21.0.0 -mkdir build && cd build -cmake .. \ - -DDISABLE_PLUGINS=true \ - -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \ -&& make -j4 # Packages app -cd .. curl -L -O http://s.sudre.free.fr/Software/files/Packages.dmg -f --retry 5 -C - hdiutil attach ./Packages.dmg sudo installer -pkg /Volumes/Packages\ 1.2.3/packages/Packages.pkg -target /