From 81dab32316a213928ff3939acc71372015334948 Mon Sep 17 00:00:00 2001 From: Ruben Pingol Date: Wed, 14 Jan 2026 17:36:28 +0800 Subject: [PATCH 1/5] Update player name to xibo-player --- package.json | 2 +- snap/snapcraft.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d24614..4822d0c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "xibo-electron", + "name": "xibo-player", "version": "4.0.0", "description": "Xibo Digital Signage Player", "main": "./dist/main/index.js", diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 377e3df..922e724 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,4 +1,4 @@ -name: xibo-electron +name: xibo-player base: core24 version: '4.0.0' summary: Xibo Linux Player From e07329ac2bcb6fbe3129bac9f3cd672253cfea97 Mon Sep 17 00:00:00 2001 From: Ruben Pingol Date: Wed, 14 Jan 2026 17:47:11 +0800 Subject: [PATCH 2/5] Update release gh action for snap packaging --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4a658f..f163fdd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: # --destructive-mode allows building without a VM/Container sudo snapcraft pack --destructive-mode # Set the snap path as an output for the next steps - echo "SNAP_PATH=$(ls *.snap | head -n 1)" >> $GITHUB_ENV + echo "SNAP_PATH=$(find ./out/make/snap -name "*.snap" -type f | head -n 1)" >> $GITHUB_ENV - name: 'Upload .deb to Release' run: | From 5c7c4645207e3915c2a9e76b9118823205207757 Mon Sep 17 00:00:00 2001 From: Ruben Pingol Date: Wed, 14 Jan 2026 18:56:21 +0800 Subject: [PATCH 3/5] Revert pack snap action and explicitly define relative path for snapcraft config source --- .github/workflows/release.yml | 2 +- package-lock.json | 4 ++-- snap/snapcraft.yaml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f163fdd..c4a658f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: # --destructive-mode allows building without a VM/Container sudo snapcraft pack --destructive-mode # Set the snap path as an output for the next steps - echo "SNAP_PATH=$(find ./out/make/snap -name "*.snap" -type f | head -n 1)" >> $GITHUB_ENV + echo "SNAP_PATH=$(ls *.snap | head -n 1)" >> $GITHUB_ENV - name: 'Upload .deb to Release' run: | diff --git a/package-lock.json b/package-lock.json index 15bab1d..d9c1681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "xibo-electron", + "name": "xibo-player", "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "xibo-electron", + "name": "xibo-player", "version": "4.0.0", "dependencies": { "@electron-toolkit/eslint-config": "^1.0.2", diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 922e724..b0c5b0d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -26,7 +26,8 @@ apps: parts: app: plugin: dump - source: out/xibo-electron-linux-x64 + source: ./out/xibo-electron-linux-x64 + source-type: local stage-packages: - libglib2.0-0 - libnss3 From 2fe0b7ccc2fb383e5694def6a2cabba0d3f4e1cb Mon Sep 17 00:00:00 2001 From: Ruben Pingol Date: Wed, 14 Jan 2026 20:04:31 +0800 Subject: [PATCH 4/5] Fix path of github action task for building windows package --- .github/workflows/release.yml | 16 ++++++++++------ forge.config.cjs | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4a658f..eab5dc5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,15 +82,19 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: powershell - - name: 'Upload .msi to Release' + - name: 'Upload .exe to Release' run: | - # The output path for the Wix MSI maker is different - $MSI_PATH = (Get-ChildItem -Path ./out/make/wix/x64/*.msi).FullName - if (-not $MSI_PATH) { - Write-Error ".msi file not found!" + # Use a broader search to find EITHER .exe or .msi + $PACKAGE_PATH = (Get-ChildItem -Path ./out/make/**/*.exe, ./out/make/**/*.msi -Recurse | Select-Object -First 1).FullName + + if (-not $PACKAGE_PATH) { + Write-Error "No installer file (.exe or .msi) found in ./out/make/" exit 1 } - gh release upload ${{ github.event.release.tag_name }} $MSI_PATH + + Write-Host "Found package at: $PACKAGE_PATH" + # Quote the path to handle spaces + gh release upload ${{ github.event.release.tag_name }} "$PACKAGE_PATH" --clobber env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: powershell \ No newline at end of file diff --git a/forge.config.cjs b/forge.config.cjs index 759bd31..7151782 100644 --- a/forge.config.cjs +++ b/forge.config.cjs @@ -5,7 +5,7 @@ module.exports = { /(.eslintrc.js)|(.gitignore)|(electron.vite.config.js)|(forge.config.cjs)|(tsconfig.*)/, /.vscode/, /.idea/, - /.github/ + /.github/, ], icon: 'resources/icon', }, From 2ef7fbfde6ebfaa76c383875613fb90e22e6ab35 Mon Sep 17 00:00:00 2001 From: Ruben Pingol Date: Thu, 15 Jan 2026 22:29:12 +0800 Subject: [PATCH 5/5] Fixing linux build gha workflow --- .github/workflows/release.yml | 17 ++++++++--------- snap/snapcraft.yaml | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eab5dc5..0226bed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,18 +27,15 @@ jobs: - name: 'Install Dependencies' run: npm ci - - name: 'Build Application Packages' + - name: 'Build .deb (Electron Forge)' run: npm run make env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: 'Pack Snap' - id: snap-build - run: | - # --destructive-mode allows building without a VM/Container - sudo snapcraft pack --destructive-mode - # Set the snap path as an output for the next steps - echo "SNAP_PATH=$(ls *.snap | head -n 1)" >> $GITHUB_ENV + - name: 'Build .snap (Snapcraft)' + run: npm run make:snap + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: 'Upload .deb to Release' run: | @@ -53,8 +50,10 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: 'Publish to Snap Store' + - name: 'Upload .snap to Snap Store' uses: snapcore/action-publish@v1 + run: | + echo "SNAP_PATH=$(find ./out/make/snap -name "*.snap" -type f | head -n 1)" >> $GITHUB_ENV with: store_login: ${{ secrets.SNAPCRAFT_LOGIN }} file: ${{ env.SNAP_PATH }} diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b0c5b0d..ec7cb65 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -26,7 +26,7 @@ apps: parts: app: plugin: dump - source: ./out/xibo-electron-linux-x64 + source: out/xibo-electron-linux-x64 source-type: local stage-packages: - libglib2.0-0