Skip to content

Commit bfafd01

Browse files
committed
Fix flatpak workflow building
1 parent 9a290c7 commit bfafd01

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ jobs:
109109
flatpak \
110110
flatpak-builder
111111
112+
- name: Prepare Flatpak runtimes
113+
run: |
114+
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
115+
flatpak install --system -y flathub \
116+
org.freedesktop.Platform//24.08 \
117+
org.freedesktop.Sdk//24.08 \
118+
org.electronjs.Electron2.BaseApp//24.08
119+
112120
- name: Build Linux ${{ matrix.arch }}
113121
run: |
114122
chmod +x Scripts/publish.sh

Docs/English/Development/Contributing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
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.
2728

2829
## Adding a New Feature
2930

Docs/Russian/Development/Contributing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
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` этой версии.
2728

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

Scripts/publish.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,8 @@ INNER
460460
flatpak_block=$(cat <<'FLATPAK'
461461
,
462462
"flatpak": {
463-
"runtimeVersion": "25.08",
464-
"baseVersion": "25.08",
463+
"runtimeVersion": "24.08",
464+
"baseVersion": "24.08",
465465
"useWaylandFlags": true
466466
}
467467
FLATPAK

0 commit comments

Comments
 (0)