From cc5b4a9f0d0baa223a0444206be453bfa0e4a18f Mon Sep 17 00:00:00 2001
From: Sudo-Ivan <ivan@quad4.io>
Date: Sat, 3 Jan 2026 20:54:33 -0600
Subject: [PATCH] feat(workflows): add build-zip task for Electron ZIP archive
 and update build process to include ZIP artifact collection

---
 .gitea/workflows/build-test.yml | 29 ++++++++++++++++++++++++++---
 .gitea/workflows/build.yml      |  8 +++++++-
 .gitea/workflows/osv-pr.yml     |  1 -
 Taskfile.yml                    |  6 ++++++
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml
index e1e0cdf..0a10bc0 100644
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -39,8 +39,10 @@ jobs:
             - name: Install system dependencies
               run: |
                   sudo apt-get update
-                  sudo apt-get install -y patchelf libopusfile0 ffmpeg espeak-ng zip rpm flatpak flatpak-builder elfutils
+                  sudo apt-get install -y patchelf libopusfile0 ffmpeg espeak-ng wine nsis zip rpm flatpak flatpak-builder elfutils appstream appstream-util
                   flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+                  # Install runtimes required for Flatpak build
+                  flatpak install --user -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08 org.electronjs.Electron2.BaseApp//24.08
 
             - name: Setup Task
               uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
@@ -67,12 +69,33 @@ jobs:
               continue-on-error: true
               run: task build-flatpak
 
-            - name: Prepare Frontend Zip
+            - name: Build Electron App (Windows EXE and NSIS)
+              run: pnpm run dist:windows
+
+            - name: Build Electron App (ZIP)
+              run: task build-zip
+
+            - name: Prepare release assets
               run: |
                   mkdir -p release-assets
-                  (cd meshchatx/public && zip -r ../../release-assets/meshchatx-frontend.zip .)
                   # Collect Linux artifacts
                   find dist -maxdepth 1 -type f \( -name "*-linux*.AppImage" -o -name "*-linux*.deb" -o -name "*-linux*.rpm" -o -name "*-linux*.flatpak" \) -exec cp {} release-assets/ \;
+                  # Collect Windows artifacts
+                  find dist -maxdepth 1 -type f \( -name "*-win*.exe" \) -exec cp {} release-assets/ \;
+                  # Collect ZIP artifacts from Electron Forge
+                  find out/make -type f -name "*.zip" -exec cp {} release-assets/ \;
+                  # Collect Python artifacts
+                  find python-dist -maxdepth 1 -type f -name "*.whl" -exec cp {} release-assets/ \;
+                  # Create frontend zip
+                  (cd meshchatx/public && zip -r ../../release-assets/meshchatx-frontend.zip .)
+
+                  # Generate checksums
+                  cd release-assets
+                  for file in *; do
+                    if [ -f "$file" ] && [[ "$file" != *.sha256 ]]; then
+                      sha256sum "$file" | tee "${file}.sha256"
+                    fi
+                  done
 
             - name: Upload artifacts
               uses: https://git.quad4.io/actions/upload-artifact@ff15f0306b3f739f7b6fd43fb5d26cd321bd4de5 # v3.2.1
diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 02086ab..3bb3e95 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -72,7 +72,8 @@ jobs:
             - name: Install system dependencies
               run: |
                   sudo apt-get update
-                  sudo apt-get install -y patchelf libopusfile0 ffmpeg espeak-ng wine nsis zip rpm flatpak flatpak-builder
+                  sudo apt-get install -y patchelf libopusfile0 ffmpeg espeak-ng wine nsis zip rpm flatpak flatpak-builder elfutils
+                  flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 
             - name: Setup Task
               uses: https://git.quad4.io/actions/setup-task@0ab1b2a65bc55236a3bc64cde78f80e20e8885c2 # v1
@@ -102,6 +103,9 @@ jobs:
             - name: Build Electron App (Windows EXE and NSIS)
               run: pnpm run dist:windows
 
+            - name: Build Electron App (ZIP)
+              run: task build-zip
+
             - name: Prepare release assets
               run: |
                   mkdir -p release-assets
@@ -110,6 +114,8 @@ jobs:
                   find dist -maxdepth 1 -type f \( -name "*-linux*.AppImage" -o -name "*-linux*.deb" -o -name "*-linux*.rpm" -o -name "*-linux*.flatpak" \) -exec cp {} release-assets/ \;
                   # Windows artifacts
                   find dist -maxdepth 1 -type f \( -name "*-win*.exe" \) -exec cp {} release-assets/ \;
+                  # ZIP artifacts from Electron Forge
+                  find out/make -type f -name "*.zip" -exec cp {} release-assets/ \;
                   # Python artifacts
                   find python-dist -maxdepth 1 -type f -name "*.whl" -exec cp {} release-assets/ \;
 
diff --git a/.gitea/workflows/osv-pr.yml b/.gitea/workflows/osv-pr.yml
index f874e1f..14113a0 100644
--- a/.gitea/workflows/osv-pr.yml
+++ b/.gitea/workflows/osv-pr.yml
@@ -18,4 +18,3 @@ jobs:
 
             - name: OSV scan
               run: bash scripts/osv_scan.sh
-
diff --git a/Taskfile.yml b/Taskfile.yml
index 42b87d6..022e093 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -239,6 +239,12 @@ tasks:
         cmds:
             - "{{.NPM}} run dist:windows"
 
+    build-zip:
+        desc: Build Electron ZIP archive using Electron Forge
+        deps: [build-frontend]
+        cmds:
+            - "{{.NPM}} run dist:zip"
+
     build-electron-all:
         desc: Build all Electron apps (Linux and Windows)
         deps: [build-frontend]