mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-28 10:11:58 +01:00
782ea69f35
* fix(linux): AppImage registers its desktop entry and icon on launch On Wayland the compositor resolves the dock icon from the window's app_id (ai.storyteller.photocraft, already set) against a host-installed .desktop file. An AppImage installs nothing, so every run showed the generic Wayland logo (#593). The app cannot set the icon itself: winit 0.30.13 (egui 0.36.2's pin) has an empty set_window_icon on Wayland; xdg-toplevel-icon-v1 landed on winit's 0.31 line only. - packaging/linux/AppRun is a script instead of a symlink: best-effort integration into $XDG_DATA_HOME before launch (desktop entry with Exec rewritten to the AppImage's path and TryExec dropped, hicolor icons copied), content-compared so an unchanged install costs a few cmp calls, refreshed when the AppImage moves, PHOTOCRAFT_NO_DESKTOP_INTEGRATION=1 opts out, and no failure can block the launch (best-effort steps silent). - packaging/linux/apprun-test.sh: 8-case smoke (passthrough, Exec rewrite with spaces, metadata preserved, idempotence, move refresh, opt-out, unwritable data dir, extracted AppDir). packaging-lint runs it and now shellchecks AppRun. - Docs: releasing.md Linux section; README install paragraph. Fixes #593 * AppRun: skip desktop integration when the AppImage path needs Exec escaping A quote, backquote, dollar, backslash, percent or line break in the path would need desktop-entry escaping (a line break could even add keys), so integration is skipped and the app still launches. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Brandon Thomas <echelon@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
66 lines
2.9 KiB
YAML
66 lines
2.9 KiB
YAML
# Quick static checks for the release pipeline (seconds, no Rust build): workflow syntax,
|
|
# packaging shell/PowerShell scripts, and the Linux desktop/AppStream/Flatpak metadata.
|
|
name: Packaging lint
|
|
|
|
on:
|
|
push:
|
|
branches: [main, release]
|
|
paths: [".github/workflows/**", "packaging/**", "assets/app-icon/**"]
|
|
pull_request:
|
|
paths: [".github/workflows/**", "packaging/**", "assets/app-icon/**"]
|
|
workflow_dispatch:
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
concurrency:
|
|
group: packaging-lint-${{ github.ref }}
|
|
cancel-in-progress: true
|
|
|
|
jobs:
|
|
lint:
|
|
runs-on: ubuntu-latest
|
|
env:
|
|
ACTIONLINT_VERSION: 1.7.12
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
- name: Install tools
|
|
run: |
|
|
sudo apt-get update
|
|
sudo apt-get install -y --no-install-recommends shellcheck desktop-file-utils appstream libxml2-utils python3-yaml
|
|
curl -fsSL "https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VERSION}/actionlint_${ACTIONLINT_VERSION}_linux_amd64.tar.gz" \
|
|
| tar -xz -C "$RUNNER_TEMP" actionlint
|
|
- name: actionlint
|
|
run: |
|
|
"$RUNNER_TEMP/actionlint" -color
|
|
- name: shellcheck
|
|
run: shellcheck packaging/*.sh packaging/*/*.sh packaging/linux/AppRun
|
|
- name: AppImage AppRun desktop integration
|
|
run: bash packaging/linux/apprun-test.sh
|
|
- name: PowerShell
|
|
shell: pwsh
|
|
run: |
|
|
foreach ($f in Get-ChildItem packaging/windows/*.ps1) {
|
|
$errors = $null
|
|
[System.Management.Automation.Language.Parser]::ParseFile($f.FullName, [ref]$null, [ref]$errors) | Out-Null
|
|
if ($errors) { $errors | ForEach-Object { Write-Output "::error file=$($f.Name)::$_" }; exit 1 }
|
|
Write-Output "ok $($f.Name)"
|
|
}
|
|
./packaging/windows/check-icons.ps1
|
|
- name: XML, desktop entry, AppStream, Flatpak manifest
|
|
run: |
|
|
xmllint --noout packaging/windows/photocraft.wxs packaging/macos/*.plist* packaging/linux/*.xml*
|
|
desktop-file-validate packaging/linux/ai.storyteller.photocraft.desktop
|
|
sed -e 's/@VERSION@/0.0.0/' -e 's/@DATE@/2026-01-01/' packaging/linux/ai.storyteller.photocraft.metainfo.xml.in >"$RUNNER_TEMP/ai.storyteller.photocraft.metainfo.xml"
|
|
appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.photocraft.metainfo.xml"
|
|
python3 - <<'EOF'
|
|
import yaml
|
|
src = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.photocraft.yml"))
|
|
bundle = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.photocraft.bundle.yml"))
|
|
for m in (src, bundle):
|
|
assert m["id"] == "ai.storyteller.photocraft" and m["command"] == "photocraft", m["id"]
|
|
for key in ("runtime", "runtime-version", "sdk", "finish-args"):
|
|
assert src[key] == bundle[key], f"Flatpak manifests disagree on {key}: {src[key]} vs {bundle[key]}"
|
|
print("Flatpak manifests ok")
|
|
EOF
|