diff --git a/.github/actions/windows-patches/action.yaml b/.github/actions/windows-patches/action.yaml index 874f3be9a..ca1d5c5e2 100644 --- a/.github/actions/windows-patches/action.yaml +++ b/.github/actions/windows-patches/action.yaml @@ -17,6 +17,10 @@ inputs: description: Update channel required: false default: 'stable' + architecture: + description: OBS build architecture + required: false + default: 'x64' runs: using: composite @@ -34,9 +38,9 @@ runs: run: | # Download OBS release . ${env:GITHUB_ACTION_PATH}\Invoke-External.ps1 - Invoke-External gh release download "${{ inputs.tagName }}" -p "OBS-Studio-${{ inputs.tagName }}-Windows.zip" - Invoke-External gh attestation verify "OBS-Studio-${{ inputs.tagName }}-Windows.zip" --owner obsproject - Expand-Archive -Path "OBS-Studio-${{ inputs.tagName }}-Windows.zip" -DestinationPath "${{ github.workspace }}/build" + Invoke-External gh release download "${{ inputs.tagName }}" -p "OBS-Studio-${{ inputs.tagName }}-Windows-${{ inputs.architecture }}.zip" + Invoke-External gh attestation verify "OBS-Studio-${{ inputs.tagName }}-Windows-${{ inputs.architecture }}.zip" --owner obsproject + Expand-Archive -Path "OBS-Studio-${{ inputs.tagName }}-Windows-${{ inputs.architecture }}.zip" -DestinationPath "${{ github.workspace }}/build" - name: Setup bouf shell: pwsh diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 514cced6e..c4da54c24 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -266,9 +266,9 @@ jobs: ubuntu_2404_x86_64_artifact_name="obs-studio-ubuntu-24.04-x86_64-${commit_hash}" ubuntu_2404_x86_64_debug_name="obs-studio-ubuntu-24.04-x86_64-${commit_hash}-dbgsym" ubuntu_2404_sources_name="obs-studio-ubuntu-24.04-sources-${commit_hash}" - windows_artifact_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-signed" - windows_installer_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-installer" - windows_debug_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-pdbs" + windows_x64_artifact_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-signed" + windows_x64_installer_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-installer" + windows_x64_debug_name="obs-studio-windows-x64-${{ steps.check.outputs.version }}-pdbs" windows_arm64_artifact_name="obs-studio-windows-arm64-${{ steps.check.outputs.version }}-signed" windows_arm64_debug_name="obs-studio-windows-arm64-${{ steps.check.outputs.version }}-pdbs" @@ -287,12 +287,12 @@ jobs: "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-24.04-x86_64-dbsym.ddeb mv -v "${ubuntu_2404_sources_name}/"obs-studio-*-sources.tar.gz \ "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Sources.tar.gz - mv -v "${windows_installer_name}/"OBS-Studio-*.exe \ - "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-Installer.exe - mv -v "${windows_artifact_name}/"OBS-Studio-*.zip \ - "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows.zip - mv -v "${windows_debug_name}/"OBS-Studio-*-pdbs.zip \ - "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-PDBs.zip + mv -v "${windows_x64_artifact_name}/"OBS-Studio-*.zip \ + "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64.zip + mv -v "${windows_x64_installer_name}/"OBS-Studio-*.exe \ + "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64-Installer.exe + mv -v "${windows_x64_debug_name}/"OBS-Studio-*-pdbs.zip \ + "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64-PDBs.zip mv -v "${windows_arm64_artifact_name}/"OBS-Studio-*.zip \ "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Windows-arm64.zip mv -v "${windows_arm64_debug_name}/"OBS-Studio-*-pdbs.zip \ @@ -327,8 +327,8 @@ jobs: ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-*.deb ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-*.ddeb ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Sources.tar.gz - ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows.zip - ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-PDBs.zip - ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-Installer.exe + ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64.zip + ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64-Installer.exe + ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-x64-PDBs.zip ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-arm64.zip ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Windows-arm64-PDBs.zip