Ver código fonte

CI: Enable service integration on Linux

This also simplifies environment variable definitions
Matt Gajownik 4 anos atrás
pai
commit
475172cffa
1 arquivos alterados com 5 adições e 13 exclusões
  1. 5 13
      .github/workflows/main.yml

+ 5 - 13
.github/workflows/main.yml

@@ -18,6 +18,10 @@ env:
   MACOS_CEF_BUILD_VERSION: '4183'
   LINUX_CEF_BUILD_VERSION: '4280'
   CEF_VERSION: '75.1.16+g16a67c4+chromium-75.0.3770.100'
+  TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
+  TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
+  RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
+  RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
 
 jobs:
   macos64:
@@ -29,10 +33,6 @@ jobs:
       VLC_VERSION: '3.0.8'
       SPARKLE_VERSION: '1.23.0'
       QT_VERSION: '5.15.2'
-      TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
-      TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
-      RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
-      RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
       SIGN_IDENTITY: ''
     steps:
       - name: 'Checkout'
@@ -443,7 +443,7 @@ jobs:
         run: |
           mkdir ./build
           cd ./build
-          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.LINUX_CEF_BUILD_VERSION }}_linux64" ..
+          cmake -DUNIX_STRUCTURE=0 -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/obs-studio-portable" -DENABLE_UNIT_TESTS=ON -DENABLE_VLC=ON -DWITH_RTMPS=ON -DBUILD_BROWSER=ON -DCEF_ROOT_DIR="${{ github.workspace }}/cmbuild/cef_binary_${{ env.LINUX_CEF_BUILD_VERSION }}_linux64" -DTWITCH_CLIENTID='${{ env.TWITCH_CLIENTID }}' -DTWITCH_HASH='${{ env.TWITCH_HASH }}' -DRESTREAM_CLIENTID='${{ env.RESTREAM_CLIENTID }}' -DRESTREAM_HASH='${{ env.RESTREAM_HASH }}' ..
       - name: 'Build'
         shell: bash
         working-directory: ${{ github.workspace }}/build
@@ -480,10 +480,6 @@ jobs:
       CMAKE_SYSTEM_VERSION: "10.0.18363.657"
       WINDOWS_DEPS_VERSION: '2019'
       VLC_VERSION: '3.0.0-git'
-      TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
-      TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
-      RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
-      RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
       VIRTUALCAM-GUID: "A3FCE0F5-3493-419F-958A-ABA1250EC20B"
     steps:
       - name: 'Add msbuild to PATH'
@@ -592,10 +588,6 @@ jobs:
       CMAKE_GENERATOR: "Visual Studio 16 2019"
       CMAKE_SYSTEM_VERSION: "10.0.18363.657"
       WINDOWS_DEPS_VERSION: '2019'
-      TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
-      TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
-      RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
-      RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
       VIRTUALCAM-GUID: "A3FCE0F5-3493-419F-958A-ABA1250EC20B"
     steps:
       - name: 'Add msbuild to PATH'