Browse Source

Merge pull request #3203 from jpark37/mac-ci-python

CI: Disable Python for Mac PR automation
Joel Bethke 5 years ago
parent
commit
63373a8fd7
2 changed files with 4 additions and 3 deletions
  1. 2 2
      CI/before-deploy-osx.sh
  2. 2 1
      CI/before-script-osx.sh

+ 2 - 2
CI/before-deploy-osx.sh

@@ -23,8 +23,8 @@ mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/
 
 # Move obspython
 hr "Moving OBS Python"
-mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/
-mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/
+# mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/
+# mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/
 
 # Package everything into a nice .app
 hr "Packaging .app"

+ 2 - 1
CI/before-script-osx.sh

@@ -6,7 +6,8 @@ git fetch --tags
 mkdir build
 cd build
 cmake -DENABLE_SPARKLE_UPDATER=ON \
--DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \
+-DDISABLE_PYTHON=ON \
 -DQTDIR=/usr/local/Cellar/qt/5.14.1 \
 -DDepsPath=/tmp/obsdeps \
 -DVLCPath=$PWD/../../vlc-3.0.8 \