Skip to content

Commit fa35f89

Browse files
committed
I hate workflows
1 parent 635835e commit fa35f89

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,21 @@ jobs:
111111
112112
- name: Prepare Flatpak runtimes
113113
run: |
114-
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
115-
flatpak install --user -y flathub \
114+
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
115+
sudo flatpak install -y flathub \
116116
org.freedesktop.Platform//24.08 \
117117
org.freedesktop.Sdk//24.08 \
118118
org.electronjs.Electron2.BaseApp//24.08
119119
120+
- name: Diagnose Flatpak environment
121+
run: |
122+
echo "=== flatpak --version ==="
123+
flatpak --version
124+
echo "=== system remotes ==="
125+
flatpak remotes --system || true
126+
echo "=== system runtimes (24.08 / Electron2) ==="
127+
flatpak list --system --runtime | grep -E 'freedesktop|electronjs|24\.08|Electron2' || true
128+
120129
- name: Build Linux ${{ matrix.arch }}
121130
run: |
122131
chmod +x Scripts/publish.sh

Docs/English/Development/Contributing.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
- Linux package app ID is `com.hyprismteam.hyprism`.
2525
- AppStream metadata is injected for Linux packaging from `Packaging/linux/com.hyprismteam.hyprism.metainfo.xml`.
2626
- RPM repack step intentionally strips `/usr/lib/.build-id` payload and does not own system directories (`/`, `/usr`, `/usr/lib`) to avoid install conflicts on Fedora.
27-
- Flatpak packaging uses runtime/base `24.08`; CI prepares Flathub and installs `org.freedesktop.Platform`, `org.freedesktop.Sdk`, and `org.electronjs.Electron2.BaseApp` for that version before build.
27+
- Flatpak packaging uses runtime/base `24.08`; CI prepares Flathub with `sudo flatpak remote-add` and installs `org.freedesktop.Platform`, `org.freedesktop.Sdk`, and `org.electronjs.Electron2.BaseApp` at the **system** level before build.
28+
- Linux CI also prints Flatpak remotes/runtimes diagnostics after install to simplify troubleshooting when flatpak-bundler fails.
2829

2930
## Adding a New Feature
3031

Docs/Russian/Development/Contributing.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
- Linux package app ID: `com.hyprismteam.hyprism`.
2525
- AppStream-метаданные для Linux-пакетов берутся из `Packaging/linux/com.hyprismteam.hyprism.metainfo.xml`.
2626
- На этапе repack для RPM намеренно удаляется payload `/usr/lib/.build-id`, а системные директории (`/`, `/usr`, `/usr/lib`) не добавляются как владельцы пакета — это предотвращает конфликты установки на Fedora.
27-
- Для Flatpak используется runtime/base `24.08`; в CI перед сборкой подключается Flathub и устанавливаются `org.freedesktop.Platform`, `org.freedesktop.Sdk` и `org.electronjs.Electron2.BaseApp` этой версии.
27+
- Для Flatpak используется runtime/base `24.08`; в CI перед сборкой Flathub подключается через `sudo flatpak remote-add`, а `org.freedesktop.Platform`, `org.freedesktop.Sdk` и `org.electronjs.Electron2.BaseApp` устанавливаются на **system**-уровень.
28+
- После установки Linux CI выводит диагностику remotes/runtimes Flatpak, чтобы упрощать разбор сбоев flatpak-bundler.
2829

2930
## Добавление новой функции
3031

0 commit comments

Comments
 (0)