fix(flatpak): source desktop metadata from in-repo packaging dir#5673
Merged
Conversation
The offline-verify overlay manifest pulled the .desktop/.metainfo.xml/.svg files via root-level `type: file` sources, which resolved against vid's cloned upstream repo (vidplace7/org.meshtastic.desktop). As of 2026-05-30 vid restructured that repo (commits #14/#15/#16) to install the metadata straight from the Meshtastic-Android source tree and dropped the standalone root-level copies, so flatpak-builder now fails with: Failed to download sources: module meshtastic-desktop: Can't find file at org.meshtastic.desktop.desktop Mirror vid's current upstream manifest: install the svg/desktop/metainfo from `desktopApp/packaging/...` (provided by our `type: dir` meshtastic-android source), add the `desktop-file-edit` Exec fixup, and remove the three stale root-level `type: file` sources. Note: the build-commands can't be exercised on macOS (flatpak-builder's nested bwrap fails under Docker Desktop's seccomp sandbox; --download-only doesn't run build-commands). Validated statically — YAML parses, referenced files exist in `desktopApp/packaging/`, and the change mirrors vid's known-good manifest. CI's Linux runners exercise the full build. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The Flatpak offline-verification job (
verify-flatpak.yml→build-flatpak) started failing on 2026-05-30 with:It had been green as recently as 2026-05-28 — nothing in this repo's app code changed the manifest in between.
Root cause (external/upstream)
Our overlay manifest
scripts/verify-flatpak/desktop-offline.yamlpulled the desktop metadata as root-leveltype: filesources:Those paths resolve against the cloned upstream repo (
vidplace7/org.meshtastic.desktop) that the workflow checks out, not our repo. On 2026-05-30 vid restructured that repo (commits #14 "Cleanup metainfo", #15, #16) to install the metadata directly from the Meshtastic-Android source tree (desktopApp/packaging/...) and removed the standalone root-level copies. vid's repo root no longer contains those files, so flatpak-builder can't find them.This is unrelated to any app/feature change — it's pure upstream drift in the third-party packaging repo.
Fix
Mirror vid's current upstream manifest. The metadata already lives in our repo and is vendored into the build via the existing
type: dirmeshtastic-androidsource, so:org.meshtastic.desktop.svgfromdesktopApp/packaging/icons/icon.svg.desktop/.metainfo.xmlfromdesktopApp/packaging/linux/desktop-file-edit --set-key=Exec --set-value="meshtastic-wrapper.sh %U"fixup (the in-repo.desktophasExec=meshtastic-desktop)type: filesourcesAll offline-specific overlay differences (bundled Gradle dist,
--offline,flatpak-sources.json, JBR-vendor sed,GRADLE_USER_HOME) are preserved.Validation
desktopApp/packaging/../gradlew,desktopApp/build.gradle.kts) that worked on 05-28 — sodesktopApp/packaging/...resolves identically.--download-onlydoesn't execute build-commands. CI's Linux runners exercise the full offline build.🤖 Generated with Claude Code