Merge pull request #373 from CoSMoSoftware/dev/fix-missing-turn-ice-s…

…erver2 Fix OBS WebRTC not reaching TURN server
CoSMoSoftware · Oct 11, 2023 · d3779b0 · d3779b0
2 parents 61ec5a3 + 2f8d29c
commit d3779b0
Show file tree

Hide file tree

Showing 8 changed files with 178 additions and 332 deletions.
diff --git a/.github/actions/download_libwebrtc/action.yml b/.github/actions/download_libwebrtc/action.yml
@@ -2,7 +2,7 @@ name: 'Download libWebRTC'
 description: 'Download libWebRTC'
 inputs:
   access_token:
-    description: 'GH App Installation access token - base64'
+    description: 'GH App Installation access token'
     required: true
   release_tag:
     description: 'LibWebRTC release tag.'
@@ -17,7 +17,6 @@ runs:
     - run: |
         echo "Looking for libwebrtc using the pattern: ${LIBWEBRTC_ASSETS_PATTERN}"
         echo "LibWebRTC release tag: ${LIBWEBRTC_RELEASE_TAG}"
-        export GH_ACCESS_TOKEN_1H_EXPIRATION=$(echo ${GH_ACCESS_TOKEN_1H_EXPIRATION} | base64 -d)
         export LIBWEBRTC_RELEASE_URL=$(curl -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${GH_ACCESS_TOKEN_1H_EXPIRATION}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/CoSMoSoftware/libwebrtc-cmake/releases/tags/${LIBWEBRTC_RELEASE_TAG} | jq .url | tr -d '"')
         echo "LIBWEBRTC_RELEASE_URL: ${LIBWEBRTC_RELEASE_URL}"
         curl -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${GH_ACCESS_TOKEN_1H_EXPIRATION}" -H "X-GitHub-Api-Version: 2022-11-28" ${LIBWEBRTC_RELEASE_URL}/assets > assets.json

diff --git a/.github/actions/download_libwebrtc/win/action.yml b/.github/actions/download_libwebrtc/win/action.yml
@@ -2,7 +2,7 @@ name: 'Download libWebRTC'
 description: 'Download libWebRTC'
 inputs:
   access_token:
-    description: 'GH App Installation access token - base64'
+    description: 'GH App Installation access token'
     required: true
   release_tag:
     description: 'LibWebRTC release tag.'
@@ -17,7 +17,6 @@ runs:
     - run: |
         Write-Host "Looking for libwebrtc using the pattern: $env:LIBWEBRTC_ASSETS_PATTERN"
         Write-Host "LibWebRTC release tag: $env:LIBWEBRTC_RELEASE_TAG"
-        $env:GH_ACCESS_TOKEN_1H_EXPIRATION = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($env:GH_ACCESS_TOKEN_1H_EXPIRATION)).Trim()
         $env:LIBWEBRTC_RELEASE_URL = cmd.exe /c curl -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer $env:GH_ACCESS_TOKEN_1H_EXPIRATION" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/repos/CoSMoSoftware/libwebrtc-cmake/releases/tags/$env:LIBWEBRTC_RELEASE_TAG" | jq -r .url
         Write-Host $env:LIBWEBRTC_RELEASE_URL
 

diff --git a/.github/workflows/macOSarm64.yml b/.github/workflows/macOSarm64.yml