From b67a238b7c580debd1ed91aa796b7ecb54139435 Mon Sep 17 00:00:00 2001 From: derrod Date: Mon, 22 Jun 2020 22:03:35 +0200 Subject: [PATCH] CI: Remove Mixer cmake variables --- .github/workflows/main.yml | 4 ---- CI/install-script-win.cmd | 4 ++-- azure-pipelines.yml | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd1d8a3d9..f55c32223 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -378,8 +378,6 @@ jobs: VLC_VERSION: '3.0.0-git' TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }} TWITCH-HASH: ${{ secrets.TWITCH_HASH }} - MIXER-CLIENTID: ${{ secrets.MIXER_CLIENTID }} - MIXER-HASH: ${{ secrets.MIXER_HASH }} RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }} RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }} steps: @@ -492,8 +490,6 @@ jobs: WINDOWS_DEPS_VERSION: '2017' TWITCH-CLIENTID: ${{ secrets.TWITCH_CLIENTID }} TWITCH-HASH: ${{ secrets.TWITCH_HASH }} - MIXER-CLIENTID: ${{ secrets.MIXER_CLIENTID }} - MIXER-HASH: ${{ secrets.MIXER_HASH }} RESTREAM-CLIENTID: ${{ secrets.RESTREAM-CLIENTID }} RESTREAM-HASH: ${{ secrets.RESTREAM-HASH }} steps: diff --git a/CI/install-script-win.cmd b/CI/install-script-win.cmd index d5643eb2b..ff0641a61 100644 --- a/CI/install-script-win.cmd +++ b/CI/install-script-win.cmd @@ -22,8 +22,8 @@ cd ../build64 cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% .. ) else ( cd ./build32 -cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" .. +cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_32% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" .. cd ../build64 -cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DMIXER_CLIENTID="%MIXER-CLIENTID%" -DMIXER_HASH="%MIXER-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" .. +cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_SYSTEM_VERSION=10.0 -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true -DENABLE_VLC=ON -DBUILD_CAPTIONS=true -DCOMPILE_D3D12_HOOK=true -DBUILD_BROWSER=true -DCEF_ROOT_DIR=%CEF_64% -DTWITCH_CLIENTID="%TWITCH-CLIENTID%" -DTWITCH_HASH="%TWITCH-HASH%" -DRESTREAM_CLIENTID="%RESTREAM-CLIENTID%" -DRESTREAM_HASH="%RESTREAM-HASH%" .. ) cd .. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 251adff76..c0528db1a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,8 +6,6 @@ variables: CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100 TWITCH-CLIENTID: $(twitch_clientid) TWITCH-HASH: $(twitch_hash) - MIXER-CLIENTID: $(mixer_clientid) - MIXER-HASH: $(mixer_hash) RESTREAM-CLIENTID: $(restream_clientid) RESTREAM-HASH: $(restream_hash)