From 0af51e3c40aecbcac95ad640071aee8200a35cab Mon Sep 17 00:00:00 2001 From: pkv Date: Sun, 4 Jul 2021 02:41:32 +0200 Subject: [PATCH] CI: Fix broken mac github workflow --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32b66b210173c9..57c010ce26a066 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -204,8 +204,6 @@ jobs: if [ -d ./OBS.app/Contents/Resources/data/obs-scripting ]; then mv ./OBS.app/Contents/Resources/data/obs-scripting/obslua.so ./OBS.app/Contents/MacOS/ - mv ./OBS.app/Contents/Resources/data/obs-scripting/_obspython.so ./OBS.app/Contents/MacOS/ - mv ./OBS.app/Contents/Resources/data/obs-scripting/obspython.py ./OBS.app/Contents/MacOS/ rm -rf ./OBS.app/Contents/Resources/data/obs-scripting/ fi @@ -229,7 +227,6 @@ jobs: ./OBS.app/Contents/PlugIns/rtmp-services.so ./OBS.app/Contents/MacOS/obs-ffmpeg-mux ./OBS.app/Contents/MacOS/obslua.so - ./OBS.app/Contents/MacOS/_obspython.so ./OBS.app/Contents/PlugIns/obs-x264.so ./OBS.app/Contents/PlugIns/text-freetype2.so ./OBS.app/Contents/PlugIns/obs-outputs.so @@ -572,7 +569,7 @@ jobs: mkdir ./build mkdir ./build64 cd ./build64 - cmake -DOBS_VERSION_OVERRIDE="26.1.2" -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DTWITCH_CLIENTID='${{ env.TWITCH_CLIENTID }}' -DTWITCH_HASH='${{ env.TWITCH_HASH }}' -DRESTREAM_CLIENTID='${{ env.RESTREAM_CLIENTID }}' -DRESTREAM_HASH='${{ env.RESTREAM_HASH }}' -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} -DJUCE_INCLUDE_DIR="${{ github.workspace }}/cmbuild/JuceVST/include" -DJUCE_LIBRARY="${{ github.workspace }}/cmbuild/JuceVST/lib/Release/JuceVST.lib" -DJUCE_LIBRARY_DEBUG="${{ github.workspace }}/cmbuild/JuceVST/lib/Debug/JuceVST.lib .. + cmake -DOBS_VERSION_OVERRIDE="27.0.1" -G"${{ env.CMAKE_GENERATOR }}" -A"x64" -DCMAKE_SYSTEM_VERSION="${{ env.CMAKE_SYSTEM_VERSION }}" -DBUILD_BROWSER=true -DCOMPILE_D3D12_HOOK=true -DVLCPath="${{ github.workspace }}/cmbuild/vlc" -DDepsPath="${{ github.workspace }}/cmbuild/deps/win64" -DQTDIR="${{ github.workspace }}/cmbuild/QT/${{ env.QT_VERSION }}/msvc2019_64" -DENABLE_VLC=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.CEF_VERSION }}_windows64_minimal" -DTWITCH_CLIENTID='${{ env.TWITCH_CLIENTID }}' -DTWITCH_HASH='${{ env.TWITCH_HASH }}' -DRESTREAM_CLIENTID='${{ env.RESTREAM_CLIENTID }}' -DRESTREAM_HASH='${{ env.RESTREAM_HASH }}' -DCOPIED_DEPENDENCIES=FALSE -DCOPY_DEPENDENCIES=TRUE -DVIRTUALCAM_GUID=${{ env.VIRTUALCAM-GUID }} -DJUCE_INCLUDE_DIR="${{ github.workspace }}/cmbuild/JuceVST/include" -DJUCE_LIBRARY="${{ github.workspace }}/cmbuild/JuceVST/lib/Release/JuceVST.lib" -DJUCE_LIBRARY_DEBUG="${{ github.workspace }}/cmbuild/JuceVST/lib/Debug/JuceVST.lib" .. - name: 'Build' run: msbuild /m /p:Configuration=RelWithDebInfo .\build64\obs-studio.sln - name: 'Package'