fix(flatpak): use rustup to install latest Rust in SDK 23.08

SDK 24.08 doesn't have javascriptcoregtk-4.1 (uses webkit 6.0).
SDK 23.08 has Rust 1.81 which doesn't support edition2024.
Solution: use SDK 23.08 with webkit2gtk 4.1 but install Rust via rustup.
This commit is contained in:
vicrodh committed 2026-01-12 12:40:03 -06:00
1 parent 6adb979e3d
commit 32ac732b7d
2 files changed
+14 -11

No files matched your search

+3 -4
View File
@@ -77,10 +77,9 @@ jobs:
- name: Install runtimes - name: Install runtimes
run: | run: |
flatpak --user install -y --noninteractive flathub \ flatpak --user install -y --noninteractive flathub \
org.freedesktop.Platform//24.08 \ org.freedesktop.Platform//23.08 \
org.freedesktop.Sdk//24.08 \ org.freedesktop.Sdk//23.08 \
org.freedesktop.Sdk.Extension.node22//24.08 \ org.freedesktop.Sdk.Extension.node20//23.08
org.freedesktop.Sdk.Extension.rust-stable//24.08
- name: Build Flatpak - name: Build Flatpak
env: env:
+11 -7
View File
@@ -1,10 +1,9 @@
app-id: com.blitzkriegfc.qbz app-id: com.blitzkriegfc.qbz
runtime: org.freedesktop.Platform runtime: org.freedesktop.Platform
runtime-version: '24.08' runtime-version: '23.08'
sdk: org.freedesktop.Sdk sdk: org.freedesktop.Sdk
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.node22 - org.freedesktop.Sdk.Extension.node20
- org.freedesktop.Sdk.Extension.rust-stable
command: qbz command: qbz
finish-args: finish-args:
- --share=ipc - --share=ipc
@@ -24,13 +23,18 @@ modules:
- name: qbz - name: qbz
buildsystem: simple buildsystem: simple
build-options: build-options:
append-path: /usr/lib/sdk/node22/bin:/usr/lib/sdk/rust-stable/bin append-path: /usr/lib/sdk/node20/bin
env:
CARGO_HOME: /run/build/qbz/.cargo
RUSTUP_HOME: /run/build/qbz/.rustup
build-args: build-args:
- --share=network - --share=network
build-commands: build-commands:
- npm ci # Install rustup and latest stable Rust (for edition2024 support)
- npm run build - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable --profile minimal
- cd src-tauri && cargo build --release - . "$CARGO_HOME/env" && npm ci
- . "$CARGO_HOME/env" && npm run build
- . "$CARGO_HOME/env" && cd src-tauri && cargo build --release
- 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