Merge pull request obsproject#288 from amazon-contributing/dennis/los…

…e-and-packaged-ubuntu CI: Package DEB and standalone build
amazon-contributing · Nov 5, 2024 · c4b7baf · c4b7baf
2 parents daae9d0 + e5095b8
commit c4b7baf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git 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
@@ -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