fix(flatpak): use GNOME SDK 48 with manual Node/Rust install

- Switch to GNOME SDK 48 which includes webkit2gtk-4.1
- Install Node.js 20 LTS directly from tarball (no SDK extension needed)
- Install Rust via rustup for latest stable version
- Add flatpak build directories to .gitignore
This commit is contained in:
vicrodh committed 2026-01-12 13:21:28 -06:00
1 parent c762e91437
commit 39acb0b59e
3 files changed
+21 -13

No files matched your search

+2 -3
View File
@@ -77,9 +77,8 @@ jobs:
- name: Install runtimes - name: Install runtimes
run: | run: |
flatpak --user install -y --noninteractive flathub \ flatpak --user install -y --noninteractive flathub \
org.freedesktop.Platform//23.08 \ org.gnome.Platform//48 \
org.freedesktop.Sdk//23.08 \ org.gnome.Sdk//48
org.freedesktop.Sdk.Extension.node20//23.08
- name: Build Flatpak - name: Build Flatpak
env: env:
+5
View File
@@ -38,3 +38,8 @@ src-tauri/target/
# Vite # Vite
vite.config.js.timestamp-* vite.config.js.timestamp-*
vite.config.ts.timestamp-* vite.config.ts.timestamp-*
# Flatpak build artifacts
flatpak-build/
flatpak-repo/
.flatpak-builder/
+14 -10
View File
@@ -1,9 +1,7 @@
app-id: com.blitzkriegfc.qbz app-id: com.blitzkriegfc.qbz
runtime: org.freedesktop.Platform runtime: org.gnome.Platform
runtime-version: '23.08' runtime-version: '48'
sdk: org.freedesktop.Sdk sdk: org.gnome.Sdk
sdk-extensions:
- org.freedesktop.Sdk.Extension.node20
command: qbz command: qbz
finish-args: finish-args:
- --share=ipc - --share=ipc
@@ -23,18 +21,24 @@ modules:
- name: qbz - name: qbz
buildsystem: simple buildsystem: simple
build-options: build-options:
append-path: /usr/lib/sdk/node20/bin
env: env:
CARGO_HOME: /run/build/qbz/.cargo CARGO_HOME: /run/build/qbz/.cargo
RUSTUP_HOME: /run/build/qbz/.rustup RUSTUP_HOME: /run/build/qbz/.rustup
npm_config_cache: /run/build/qbz/.npm
PATH: /run/build/qbz/node/bin:/run/build/qbz/.cargo/bin:/usr/bin:/bin
build-args: build-args:
- --share=network - --share=network
build-commands: build-commands:
# Install rustup and latest stable Rust (for edition2024 support) # Install Node.js 20 LTS from tarball
- curl -fsSL https://nodejs.org/dist/v20.19.2/node-v20.19.2-linux-x64.tar.xz | tar -xJ
- mv node-v20.19.2-linux-x64 node
# Install Rust via rustup
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal
- . "$CARGO_HOME/env" && npm ci # Build the application
- . "$CARGO_HOME/env" && npm run build - npm ci
- . "$CARGO_HOME/env" && cd src-tauri && cargo build --release - npm run build
- cd src-tauri && cargo build --release
# Install the binary and assets
- install -Dm755 src-tauri/target/release/qbz-nix /app/bin/qbz - install -Dm755 src-tauri/target/release/qbz-nix /app/bin/qbz
- install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.desktop /app/share/applications/com.blitzkriegfc.qbz.desktop - install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.desktop /app/share/applications/com.blitzkriegfc.qbz.desktop
- install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.metainfo.xml /app/share/metainfo/com.blitzkriegfc.qbz.metainfo.xml - install -Dm644 packaging/flatpak/com.blitzkriegfc.qbz.metainfo.xml /app/share/metainfo/com.blitzkriegfc.qbz.metainfo.xml