Skip to content

Flatpak: use Freedesktop 26.08 in both manifests - #1420

Open
nilltadios wants to merge 4 commits into
storytold:mainfrom
nilltadios:chore/flatpak-26-08
Open

nilltadios wants to merge 4 commits into
storytold:mainfrom
nilltadios:chore/flatpak-26-08

Conversation

@nilltadios

@nilltadios nilltadios commented Oct 26, 2026 •

Copy link
Copy Markdown

What this changes

Fixes #1403.

Both Flatpak manifests use Freedesktop Platform/SDK 26.08, including the matching Rust extension for source builds. Source preparation uses a wrapper around a pinned upstream cargo generator: it includes unused patch manifests and keeps separate replacements for different locked git revisions. The original generator omitted these inputs, preventing offline resolution. Cargo.lock and the application dependencies stay unchanged.

How verified

On 2026-10-26:

  • Release-bundle compatibility matrix: all eight native x86_64/aarch64 jobs pass. SHA-256-verified published tarballs build and export with the changed manifests, then pass file-operation/render checks under Platform 26.08 and a Rust extension compile/run probe.
  • Full source-build matrix: all eight native x86_64/aarch64 jobs pass using the changed source manifests, cargo --offline build --release --locked, SDK 26.08 and its Rust extension. Packaging and export also pass. Inputs, scripts and checksums are retained in these runs' immutable workflow commits.
  • Local comparison of the identical published binaries on Platform 25.08.19 and 26.08.3 passes open/save/reopen/export checks. PdfCraft, WordCraft and DeckCraft produce byte-identical rendered PNGs; GridCraft produces byte-identical CSV.
  • Locally installed test bundles pass GUI startup and screenshot checks on x86_64 GNOME/Wayland. OpenFile and SaveFile portal requests open and cancel. DeckCraft's generated silent WAV plays in the editor and during slideshow autoplay, with advancing position and no reported error.
  • Full offline metadata resolution passes for each source tree, with unchanged lockfile hashes. Source and bundle manifest fields agree; all manifest fields except runtime-version match main. cargo fmt --all -- --check and git diff --check pass.
  • Original vendoring on SDK 25.08 reproduces the missing-patch error, documenting the existing failure before the source-input fix. That job expects the failure; it is not counted as a passing source build.

Limits

Native ARM GUI acceptance and selecting a file through the native chooser were not automated. Full local workspace Rust test suites are not reported as passing: the bounded GridCraft/WordCraft CI attempts timed out while compiling, and DeckCraft lacks the host ALSA development headers. No Rust application source, Cargo dependency, sandbox permission or asset changes.

Reverting this PR restores the previous runtime and source-generation instructions.

Summary by CodeRabbit

  • Packaging
    • Updated the Flatpak package to use the 26.08 runtime.
    • Improved Flatpak build handling for patched and Git-sourced components, supporting more consistent package generation.
  • Validation
    • Confirmed release-bundle builds, file operations, Rust SDK extension checks, source builds, and package exports on x86_64 and aarch64. ARM graphical interface acceptance remains unverified.

@coderabbitai

coderabbitai Bot commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review.

Recent review info
Run configuration
Commits

Reviewing files that changed from the base of the PR and between aaf6c1c and 65cf985.

Files selected for processing: 4
  • ROADMAP.md
  • packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml
  • packaging/linux/flatpak/ai.storyteller.deckcraft.yml
  • packaging/linux/flatpak/generate-cargo-sources.py

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 6 remain after this review.

Walkthrough

Both Flatpak manifests now target Freedesktop 26.08. The packaging instructions use a new script to generate Cargo sources, including unused patch packages and distinct Git revisions. The roadmap records compatibility checks on x86_64 and aarch64 and notes that ARM GUI acceptance remains unverified.

Changes: Flatpak packaging updates

Layer / File(s) Summary
Cargo source generation
packaging/linux/flatpak/ai.storyteller.deckcraft.yml, packaging/linux/flatpak/generate-cargo-sources.py
The manifest instructions use the repository wrapper and pinned generator. The script adds missing patch.unused packages, generates sources, preserves Git revision query values in replacements, and writes formatted JSON.
Runtime update and compatibility record
packaging/linux/flatpak/ai.storyteller.deckcraft.yml, packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml, ROADMAP.md
Both manifests set runtime-version to 26.08. The roadmap records the candidate checks and states that ARM GUI acceptance remains unverified.

Priority: Low

Estimated code review effort: 2 (Simple) | ~15 minutes

Change: Bug fix

Possibly related PRs

  • storytold/deckcraft#1034: Its locked Git dependencies are an input to this PR’s handling of separate Git revisions during offline Flatpak source generation.

Suggested reviewers: echelon

Merge Risk: Minimal · up to 65cf9

No actionable issue remains before merge. ARM GUI acceptance is still unverified, but no failure has been identified.

Architecture risk: Low · up to 65cf9

The change affects 2 systems.

Changed systems: packaging, ROADMAP.md

Architecture concerns
No architecture-level concerns identified.

Review details

Systems and components

  • observed — packaging (service) was modified; 3 changed files map to changed impact.
  • observed — ROADMAP.md (service) was modified; 1 changed file maps to changed impact.

Before / after behavior

  • observed — Modified behavior in ROADMAP.md: Replaces the prior review metadata and accumulated progress summary with a 2026-10-26 trivial Flatpak runtime-candidate update; the target remains PowerPoint for Mac 16.113.
  • observed — Modified behavior in ROADMAP.md: Adds the Flatpak #1403 progress entry: source and release-bundle manifests use Freedesktop 26.08; release-bundle builds, file operations, Rust SDK extension probes, full source builds, and package exports pass on native x86_64 and aarch64. ARM GUI acceptance remains unverified, and readiness estimates are unchanged.
  • observed — Modified behavior in ROADMAP.md: Adds a revision-history entry recording the Flatpak 26.08 candidate and compatibility-check limits, with estimates unchanged.
  • observed — Modified behavior in packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml: The manifest’s runtime-version changes from 25.08 to 26.08.
Pre-merge checks: Passed 4 · Failed 1

Failed Failed checks: 1 warning

Check name Status Explanation Resolution
Docstring Coverage Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 1 files. (3 skipped: 3 … Write docstrings for the functions missing them to satisfy the coverage threshold.
Passed Passed checks: 4 passed
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly and concisely describes the primary change: updating both Flatpak manifests to Freedesktop 26.08.
Linked Issues check Passed Issue #1403 requires both Flatpak manifests to use Freedesktop 26.08 and remain consistent. Both manifests set runtime-version: '26.08' and retain matching finish-args. The source manifest uses `o…
Out of Scope Changes check Passed The changes stay within issue #1403. The generator wrapper supports the required offline source build. The ROADMAP.md entries record the Flatpak candidate, validation results, and known limits. No u…
Full details: Linked Issues check

Explanation

Issue #1403 requires both Flatpak manifests to use Freedesktop 26.08 and remain consistent. Both manifests set runtime-version: '26.08' and retain matching finish-args. The source manifest uses org.freedesktop.Sdk.Extension.rust-stable and the new pinned-generator wrapper, which vendors unused patch manifests and separates Git revisions for offline builds. The reported native x86_64/aarch64 source and release-bundle matrices pass. The reported checks cover startup, rendering, file operations, open/save/reopen/export, portal dialogs, and slideshow audio. Byte-identical rendered output also supports font and rendering compatibility.

Full details: Out of Scope Changes check

Explanation

The changes stay within issue #1403. The generator wrapper supports the required offline source build. The ROADMAP.md entries record the Flatpak candidate, validation results, and known limits. No unrelated application source, dependency, sandbox-permission, or asset changes are present in the reviewed diff.

Full details: Docstring Coverage

Explanation

Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 1 files. (3 skipped: 3 unsupported.)

Resolution

Write docstrings for the functions missing them to satisfy the coverage threshold.

Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@nilltadios
nilltadios marked this pull request as ready for review October 26, 2026 15:56
@Harrison-Booth

Copy link
Copy Markdown
Contributor

Review notes (read the diff; no Flatpak tooling here).

  • Both manifests move to runtime 26.08 together, so the "identical in both" rule stays satisfied. generate-cargo-sources.py parses (syntax check only); I did not run it, since flatpak-builder and the upstream generator are not available on this machine.
  • The PR text claims builds and exports on x86_64 and aarch64; I could not reproduce those, and I did not confirm that the 26.08 runtime is published on Flathub.
  • ROADMAP.md header and log rows are updated.

@FredApps FredApps left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReviewerA — source-read COMMENT (not an approval)

I read the head of the diff: both Flatpak manifests (source and release bundle) move to the Freedesktop runtime 26.08 from 25.08 (candidate #1403), and the ROADMAP records the limits of the compatibility checks, with estimates unchanged. A runtime bump changes every library the application links at run time, so it needs a successful Flatpak build and a start of the application on the new runtime, which only a CI or developer machine can show; a bump to a runtime version that is newer than the current stable one (26.08 would not be released before the date it names) also needs confirming that it exists on Flathub. The source preparation vendors dependencies, and any hash or URL there must be unchanged. I have not run it, and no exact-head CI result exists for this head. Nothing was run.

I ran nothing and have no exact-head CI result for this PR, so this is not an approval. Where a diff was long I read its code hunks rather than every generated or documentation line.

Status: waiting_author.

@aiongg aiongg added the infra Tests, CI, docs, build, packaging, tooling label Nov 4, 2026

@aiongg aiongg left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AI-generated review (Opus). Not a maintainer decision.

Small fixes needed (not certain):

Both Flatpak manifests move from runtime 25.08 to 26.08 together, and a small wrapper makes the vendored cargo sources resolve offline (unused patches, several revisions of one git repository).

  • packaging/linux/flatpak/ai.storyteller.deckcraft.yml:18 and packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml:16 change together. No other manifest field changes, so the two manifests stay identical where they must.
  • The Rust SDK extension (ai.storyteller.deckcraft.yml:20-21) has no explicit branch, so it follows the 26.08 SDK.
  • packaging/linux/flatpak/generate-cargo-sources.py:29-33 appends the [[patch.unused]] entries (Cargo.lock:6287 onwards) to the generator input without rewriting Cargo.lock.
  • packaging/linux/flatpak/generate-cargo-sources.py:41-56 gives each locked git source its own replacement with its rev/tag/branch. This matters here because three craft-libs revisions are locked (Cargo.lock:817, 825, 834).
  • The wrapper does not check the downloaded generator's SHA-256. Pinning the commit in the raw URL (ai.storyteller.deckcraft.yml:5) mitigates this, but a checksum check would make a tampered or truncated download fail loudly.
  • ROADMAP.md:5 overwrites the newest existing header line. The convention is to add a new line above it and leave 'Last reviewed' at the actual review date, since this is a packaging-only change.

Claims checked:

  • verified: Both Flatpak manifests use Freedesktop Platform/SDK 26.08 (fixes #1403) (packaging/linux/flatpak/ai.storyteller.deckcraft.yml:18 and packaging/linux/flatpak/ai.storyteller.deckcraft.bundle.yml:16 both set runtime-version '26.08'; no other runtime-version exists in the repository)
  • verified: Source builds use the matching Rust SDK extension (packaging/linux/flatpak/ai.storyteller.deckcraft.yml:20-21 lists org.freedesktop.Sdk.Extension.rust-stable without a branch, so it follows the SDK version; yml:42 appends /usr/lib/sdk/rust-stable/bin to the path)
  • verified: Source preparation includes unused patch manifests that the upstream generator omits (packaging/linux/flatpak/generate-cargo-sources.py:29-33 appends lock['patch']['unused'] entries to the package list, deduplicated by (name, version, source); Cargo.lock:6287-6305 holds four such egui entries)
  • verified: Separate source replacements are kept for different locked git revisions of one repository (packaging/linux/flatpak/generate-cargo-sources.py:41-56 drops the generator's git replacements and adds one per full source string, carrying rev/tag/branch from the query; Cargo.lock:817, 825 and 834 lock th…
  • verified: The wrapper uses a pinned upstream cargo generator (packaging/linux/flatpak/ai.storyteller.deckcraft.yml:5 downloads flatpak-cargo-generator.py from commit 9d86d336a39b9af38b86f114b6ce5820fe260f91; generate-cargo-sources.py:22 defaults to that file in the working directory)
  • unverified: Cargo.lock and the application dependencies stay unchanged; all manifest fields except runtime-version match main (Only packaging/linux/flatpak/*.yml, generate-cargo-sources.py and ROADMAP.md change; in both manifests the only changed non-comment line is runtime-version (ai.storyteller.deckcraft.ym…
  • unverified: Release-bundle and full source builds, exports and runtime checks pass on x86_64 and aarch64 with 26.08 (There are no build results in the repository; packaging/linux/flatpak-bundle.sh:55-69 is the bundle build and smoke test that would show this)

Recommendation: merge after the fixes above; they may be pushed to this branch.

Reviewed at 65cf985.

@aiongg aiongg assigned aiongg and unassigned aiongg Nov 4, 2026
@aiongg

aiongg commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Automated message. Not a maintainer decision.

This branch conflicts with main. Could you merge or rebase main into it? The conflict needs a person to resolve.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infra Tests, CI, docs, build, packaging, tooling

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update Flatpak runtime and SDK to Freedesktop 26.08

4 participants