unom/punktfunk
1
0
Fork 0
Code Issues Pull Requests Actions 15 Packages Projects Releases 18 Wiki Activity

fix(ci/flatpak): cargo-sources generator needs python3-tomlkit, not toml

Browse Source 
flatpak-cargo-generator.py (master) imports `tomlkit` + `aiohttp`; the workflow
installed `python3-toml`, so the "Generate offline cargo sources" step would fail
with ModuleNotFoundError. Install python3-tomlkit instead, and correct the same
note in build-flatpak.sh.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Enrico Bühler
2026-06-15 01:47:09 +02:00
parent 5faf754b7f
commit 7d7b5c8611
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/flatpak.yml
+2 -1
View File
@@ -47,7 +47,8 @@ jobs:
- name: Tooling - name: Tooling
run: | run: |
dnf -y install flatpak flatpak-builder git python3 python3-aiohttp python3-toml curl jq # flatpak-cargo-generator.py (master) needs aiohttp + tomlkit (NOT the old `toml`).
dnf -y install flatpak flatpak-builder git python3 python3-aiohttp python3-tomlkit curl jq
# Flathub provides the GNOME runtime/SDK + the rust-stable + ffmpeg-full extensions. # Flathub provides the GNOME runtime/SDK + the rust-stable + ffmpeg-full extensions.
flatpak remote-add --user --if-not-exists flathub \ flatpak remote-add --user --if-not-exists flathub \
https://dl.flathub.org/repo/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
packaging/flatpak/build-flatpak.sh
+1 -1
View File
@@ -63,7 +63,7 @@ else
curl -fsSL -o "$GEN" \ curl -fsSL -o "$GEN" \
https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py
fi fi
# Needs python3 + aiohttp + toml. On a host that lacks them (e.g. the Deck), generate on the # Needs python3 + aiohttp + tomlkit. On a host that lacks them (e.g. the Deck), generate on the
# Mac / a dev box instead and rsync the result next to the manifest (reused by the branch above). # Mac / a dev box instead and rsync the result next to the manifest (reused by the branch above).
python3 "$GEN" Cargo.lock -o packaging/flatpak/cargo-sources.json python3 "$GEN" Cargo.lock -o packaging/flatpak/cargo-sources.json
fi fi