From e5095b876d6792afad192aa9089d101cfd156bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20S=C3=A4dtler?= <saedtler@twitch.tv>
Date: Tue, 5 Nov 2024 10:40:52 +0100
Subject: [PATCH] CI: Package both Ubuntu DEB and Standalone build

---
 .github/scripts/.package.zsh         | 20 ++++++++++----------
 .github/workflows/build-project.yaml | 12 ++++++++++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/.package.zsh b/.github/scripts/.package.zsh
index f7c198f22b163d..62a222597e5e97 100755
--- a/.github/scripts/.package.zsh
+++ b/.github/scripts/.package.zsh
@@ -233,19 +233,19 @@ package() {
       pushd ${project_root}/build_${target%%-*}/install/${config}
       XZ_OPT=-T0 tar -cvJf ${project_root}/build_${target%%-*}/${output_name}.tar.xz (bin|lib|share)
       popd
-    }
 
-    pushd ${project_root}
-    ${cmake_bin} --build build_${target%%-*} --config ${config} --target package_source ${cmake_args}
-    output_name="${output_name}-sources"
+      pushd ${project_root}
+      ${cmake_bin} --build build_${target%%-*} --config ${config} --target package_source ${cmake_args}
+      output_name="${output_name}-sources"
 
-    pushd ${project_root}/build_${target%%-*}
-    local -a files=(obs-studio-*-sources.tar.*)
-    for file (${files}) {
-      mv ${file} ${file//obs-studio-*-sources/${output_name}}
+      pushd ${project_root}/build_${target%%-*}
+      local -a files=(obs-studio-*-sources.tar.*)
+      for file (${files}) {
+        mv ${file} ${file//obs-studio-*-sources/${output_name}}
+      }
+      popd
+      popd
     }
-    popd
-    popd
 
     log_group
   }
diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml
index 046b16c0b508b9..513bcd21f205fb 100644
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -201,12 +201,20 @@ jobs:
           target: x86_64
           config: ${{ needs.check-event.outputs.config }}
 
-      - name: Package OBS Studio 📀
+      - name: Package OBS Studio (Portable) 📀
         uses: ./.github/actions/package-obs
         with:
           target: x86_64
           config: ${{ needs.check-event.outputs.config }}
-          package: ${{ fromJSON(needs.check-event.outputs.package) }}
+          package: false
+
+      - name: Package OBS Studio (DEB) 📀
+        if: ${{ fromJSON(needs.check-event.outputs.package) }}
+        uses: ./.github/actions/package-obs
+        with:
+          target: x86_64
+          config: ${{ needs.check-event.outputs.config }}
+          package: true
 
       - name: Upload Source Tarball 🗜️
         uses: actions/upload-artifact@v4