From 1531b1ab73ed68e879120cab64761d3878009549 Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 26 Nov 2025 16:48:08 +0100 Subject: [PATCH 1/5] ci: update Linux target configurations in package.json --- package.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 72e106562..6b8c8a3b9 100644 --- a/package.json +++ b/package.json @@ -58,10 +58,15 @@ "linux": { "category": "Video", "target": [ - "AppImage", - "Snap", - "deb", - "rpm" + { "target": "AppImage", "arch": ["x64", "armv7l", "arm64"] }, + { "target": "Snap", "arch": ["x64", "armv7l", "arm64"] }, + { "target": "deb", "arch": ["x64", "armv7l", "arm64"] }, + + { "target": "rpm", "arch": ["x64", "arm64"] }, + + { "target": "pacman", "arch": ["x64"] }, + + { "target": "flatpak", "arch": ["x64"] } ], "artifactName": "${name}-${version}-${os}-${arch}.${ext}", "icon": "apps/web/src/assets/icons" From ae6e97db91ddc5931448ba4b277544b2f44c04d3 Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:12:39 +0100 Subject: [PATCH 2/5] ci: install Linux dependencies in CI workflow Added steps to install Linux system dependencies for builds. --- .github/workflows/build-and-make.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build-and-make.yaml b/.github/workflows/build-and-make.yaml index fff436794..10c9a44ec 100644 --- a/.github/workflows/build-and-make.yaml +++ b/.github/workflows/build-and-make.yaml @@ -37,6 +37,15 @@ jobs: node-version: '22' cache: 'pnpm' + - name: Install Linux system dependencies + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt-get update + # rpm: for rpm builds + # libarchive-tools: provides 'bsdtar' for pacman builds + # flatpak flatpak-builder: for flatpak builds + sudo apt-get install --no-install-recommends -y rpm libarchive-tools flatpak flatpak-builder + - name: Install dependencies run: pnpm install --no-frozen-lockfile @@ -70,6 +79,8 @@ jobs: dist/executables/**/*.snap dist/executables/**/*.AppImage dist/executables/**/*.tar.gz + dist/executables/**/*.pacman + dist/executables/**/*.flatpak retention-days: 7 - name: Upload artifacts (Windows) @@ -122,6 +133,8 @@ jobs: artifacts/linux-artifacts/*.rpm artifacts/linux-artifacts/*.snap artifacts/linux-artifacts/*.tar.gz + artifacts/linux-artifacts/*.pacman + artifacts/linux-artifacts/*.flatpak artifacts/windows-artifacts/*-setup.exe artifacts/windows-artifacts/*.msi artifacts/windows-artifacts/*.zip From 3b76db7aebfd046c77b1837fcad320f585b3e44c Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:27:48 +0100 Subject: [PATCH 3/5] ci: update Linux targets in package.json --- package.json | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6b8c8a3b9..d73f54233 100644 --- a/package.json +++ b/package.json @@ -58,15 +58,30 @@ "linux": { "category": "Video", "target": [ - { "target": "AppImage", "arch": ["x64", "armv7l", "arm64"] }, - { "target": "Snap", "arch": ["x64", "armv7l", "arm64"] }, - { "target": "deb", "arch": ["x64", "armv7l", "arm64"] }, - - { "target": "rpm", "arch": ["x64", "arm64"] }, - - { "target": "pacman", "arch": ["x64"] }, - - { "target": "flatpak", "arch": ["x64"] } + { + "target": "AppImage", + "arch": ["x64", "armv7l", "arm64"] + }, + { + "target": "deb", + "arch": ["x64", "armv7l", "arm64"] + }, + { + "target": "Snap", + "arch": ["x64", "arm64"] + }, + { + "target": "rpm", + "arch": ["x64", "arm64"] + }, + { + "target": "pacman", + "arch": ["x64"] + }, + { + "target": "flatpak", + "arch": ["x64"] + } ], "artifactName": "${name}-${version}-${os}-${arch}.${ext}", "icon": "apps/web/src/assets/icons" From 4020de1af93d37e5dfc9003cab5158f63705934a Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:28:28 +0100 Subject: [PATCH 4/5] ci: enhance build workflow with Flatpak setup Added Flatpak configuration steps to the build workflow. --- .github/workflows/build-and-make.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-make.yaml b/.github/workflows/build-and-make.yaml index 10c9a44ec..00a2f5d8d 100644 --- a/.github/workflows/build-and-make.yaml +++ b/.github/workflows/build-and-make.yaml @@ -41,10 +41,15 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update - # rpm: for rpm builds - # libarchive-tools: provides 'bsdtar' for pacman builds - # flatpak flatpak-builder: for flatpak builds sudo apt-get install --no-install-recommends -y rpm libarchive-tools flatpak flatpak-builder + + # Configure Flatpak + # 1. Add the Flathub repository (source of runtimes) + flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo + + # 2. Install the standard Freedesktop Platform and SDK (required by electron-builder) + # We install version 24.08 as a safe default, electron-builder might pick what it needs + flatpak install --user -y flathub org.freedesktop.Platform//24.08 org.freedesktop.Sdk//24.08 - name: Install dependencies run: pnpm install --no-frozen-lockfile From 2c1d29f841878a25e183e591c33c45d68b865c1e Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:46:27 +0100 Subject: [PATCH 5/5] ci: restrict architecture targets to x64 only --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d73f54233..e7fc4b287 100644 --- a/package.json +++ b/package.json @@ -68,11 +68,11 @@ }, { "target": "Snap", - "arch": ["x64", "arm64"] + "arch": ["x64"] }, { "target": "rpm", - "arch": ["x64", "arm64"] + "arch": ["x64"] }, { "target": "pacman",