enricobuehler
5b2f795b13
Run 18870 died 5 minutes into "Build the flatpak (offline — deps + sources
prefetched above)" with the prefetch step green:
Downloading sources
Fetching full git repo https://github.com/ValveSoftware/gamescope.git
Fetching git repo https://gitlab.freedesktop.org/wlroots/wlroots.git, ref refs/tags/0.19.3
Fetching git repo https://gitlab.freedesktop.org/emersion/libliftoff.git, ref refs/tags/v0.5.0
Fetching full git repo https://github.com/Joshua-Ashton/vkroots
Fetching git repo https://gitlab.freedesktop.org/emersion/libdisplay-info, ref refs/tags/0.3.0
error: RPC failed; HTTP 503 curl 22 The requested URL returned error: 503
fatal: expected 'acknowledgments'
Failed to download sources: module gamescope-wsi-layer: Child process exited with code 128
That step was never actually offline. flatpak-builder runs the download phase
again as part of every build — builder-main.c calls builder_manifest_download()
unconditionally (only --disable-download skips it) and passes
`update_vcs = !opt_disable_updates`. With updates on (the default),
builder_git_mirror_repo() always does a live `git ls-remote` + `git fetch` for
every git source AND every submodule, even ones pinned to an immutable commit
sha. So the long compile step carried five unretried network fetches in front
of it, and gitlab.freedesktop.org returning 503 took the whole job down —
outside retry.sh, which only wraps the prefetch.
Pass --disable-updates ("only download missing sources, never update to latest
vcs version") to the build. builder_git_mirror_repo() then short-circuits on
`git cat-file -e <commit>` against the warm mirror and returns before any
network call. It cannot change what gets built: every `type: git` source in the
manifest is commit-pinned (gamescope, glm, stb — plus gamescope's submodules,
pinned by their gitlinks), so "don't update" is a semantic no-op. Anything
genuinely missing still downloads, so a cold state dir self-heals.
Same flag on the prefetch's --download-only, where it is already retried: it
makes a restored .flatpak-builder cache actually save network instead of
re-fetching pins that cannot have moved. That is ~2.5 min per run of
wlroots/libliftoff/vkroots/libdisplay-info — submodules this manifest never
even builds, since the module sets enable_gamescope=false; flatpak-builder
mirrors them only because it clones submodules by default.
build-flatpak.sh gets the same flag so local/Deck builds match CI.
108 lines
5.8 KiB
Bash
Executable File
108 lines
5.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build the punktfunk Linux client as a single-file `.flatpak` bundle.
|
|
#
|
|
# Works on the Steam Deck (org.flatpak.Builder from Flathub, user-scope, NO root) and on any
|
|
# Linux box with flatpak + flatpak-builder. The CI does the same steps (.gitea/workflows/flatpak.yml).
|
|
#
|
|
# On the Deck (one-time):
|
|
# flatpak install --user -y flathub org.flatpak.Builder
|
|
# Then run this script from the repo root:
|
|
# bash packaging/flatpak/build-flatpak.sh
|
|
# Output: dist/punktfunk-client-<version>.flatpak (install with `flatpak install --user <file>`)
|
|
#
|
|
# Env knobs:
|
|
# VERSION=... version string for the bundle name (default: git describe / 0.0.1-dev)
|
|
# ONLINE=1 skip offline cargo-sources.json; build with --share=network (fast local
|
|
# iteration, non-reproducible). Default: offline (regenerates cargo-sources).
|
|
# BUILDER=... override the flatpak-builder invocation (default: auto-detect host
|
|
# flatpak-builder, else `flatpak run org.flatpak.Builder`).
|
|
# ARCH=... target architecture (default: this machine's). `aarch64` builds the arm64
|
|
# client — the manifest carries the per-arch PKG_CONFIG_PATH and the matching
|
|
# prebuilt Skia archive. NOTE this is not a cross-compile: flatpak-builder
|
|
# runs the build inside a sandbox for that arch, so building aarch64 on an
|
|
# x86_64 box needs qemu binfmt registered and is very slow. Run it on an
|
|
# arm64 machine.
|
|
set -euo pipefail
|
|
|
|
ROOTDIR="$(cd "$(dirname "$0")/../.." && pwd)"
|
|
cd "$ROOTDIR"
|
|
|
|
APP_ID="io.unom.Punktfunk"
|
|
MANIFEST="packaging/flatpak/io.unom.Punktfunk.yml"
|
|
VERSION="${VERSION:-$(git describe --tags --always --dirty 2>/dev/null || echo 0.0.1-dev)}"
|
|
VERSION="${VERSION#v}"
|
|
# `flatpak --default-arch` reports flatpak's own name for this machine (x86_64 / aarch64).
|
|
ARCH="${ARCH:-$(flatpak --default-arch 2>/dev/null || uname -m)}"
|
|
# Arch-suffixed so an x86_64 and an aarch64 bundle can sit in dist/ together instead of the
|
|
# second silently overwriting the first. (CI composes its own published filename.)
|
|
BUNDLE="dist/punktfunk-client-${VERSION}-${ARCH}.flatpak"
|
|
|
|
# --- pick a flatpak-builder (host binary, or the org.flatpak.Builder flatpak on the Deck) ---
|
|
if [ -n "${BUILDER:-}" ]; then
|
|
FPB=($BUILDER)
|
|
elif command -v flatpak-builder >/dev/null 2>&1; then
|
|
FPB=(flatpak-builder)
|
|
elif flatpak info org.flatpak.Builder >/dev/null 2>&1; then
|
|
FPB=(flatpak run org.flatpak.Builder)
|
|
else
|
|
echo "error: need flatpak-builder. On the Deck: flatpak install --user -y flathub org.flatpak.Builder" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# --- ensure Flathub is available for the runtime/SDK/extensions ---
|
|
flatpak remote-add --user --if-not-exists flathub \
|
|
https://dl.flathub.org/repo/flathub.flatpakrepo
|
|
|
|
# --- offline crate cache (skip with ONLINE=1) -------------------------------------------
|
|
EXTRA_ARGS=()
|
|
if [ "${ONLINE:-0}" = "1" ]; then
|
|
echo "==> ONLINE build (cargo fetches from crates.io; non-reproducible)"
|
|
EXTRA_ARGS+=(--build-args=--share=network)
|
|
# The manifest references cargo-sources.json; provide an empty list so it stays valid.
|
|
[ -f packaging/flatpak/cargo-sources.json ] || echo '[]' > packaging/flatpak/cargo-sources.json
|
|
elif [ -f packaging/flatpak/cargo-sources.json ] && [ "${FORCE_GEN:-0}" != "1" ]; then
|
|
# Reuse a cargo-sources.json that was generated elsewhere (e.g. on a dev box with network +
|
|
# python aiohttp/toml, then rsynced to a build host that lacks them — like the Deck). The
|
|
# offline crate cache is a pure function of Cargo.lock, so this is reproducible. FORCE_GEN=1
|
|
# to regenerate anyway.
|
|
echo "==> reusing existing packaging/flatpak/cargo-sources.json (FORCE_GEN=1 to regenerate)"
|
|
else
|
|
echo "==> generating offline cargo-sources.json from Cargo.lock"
|
|
GEN=/tmp/flatpak-cargo-generator.py
|
|
if [ ! -f "$GEN" ]; then
|
|
curl -fsSL -o "$GEN" \
|
|
https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/cargo/flatpak-cargo-generator.py
|
|
fi
|
|
# 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).
|
|
# Prune the microsoft/windows-rs git crates first (punktfunk-client-windows only) — otherwise
|
|
# flatpak-builder full-clones that multi-GB repo and fills the disk. See prune-windows-lock.py.
|
|
python3 packaging/flatpak/prune-windows-lock.py Cargo.lock /tmp/Cargo.flatpak.lock
|
|
python3 "$GEN" /tmp/Cargo.flatpak.lock -o packaging/flatpak/cargo-sources.json
|
|
fi
|
|
|
|
# --- build into a local ostree repo, then export a single-file bundle --------------------
|
|
echo "==> flatpak-builder ($APP_ID, version $VERSION, arch $ARCH)"
|
|
# --default-branch=stable matches CI / the hosted repo ref, so a locally-built install can also
|
|
# track flatpak.unom.io. build-bundle must then be told the branch (else it defaults to `master`).
|
|
# --disable-updates matches CI (see .gitea/workflows/flatpak.yml for the full why): every git
|
|
# source in the manifest is commit-pinned, so re-running this script reuses the mirrors already in
|
|
# the .flatpak-builder state dir instead of re-fetching gamescope and its submodules (~2.5 min of
|
|
# wlroots/libliftoff/vkroots/libdisplay-info that this manifest never even builds).
|
|
"${FPB[@]}" --user --force-clean --disable-rofiles-fuse \
|
|
--default-branch=stable \
|
|
--disable-updates \
|
|
--arch="$ARCH" \
|
|
--install-deps-from=flathub \
|
|
"${EXTRA_ARGS[@]}" \
|
|
--repo="$ROOTDIR/.flatpak-repo" \
|
|
"$ROOTDIR/.flatpak-build" "$MANIFEST"
|
|
|
|
mkdir -p dist
|
|
flatpak build-bundle --arch="$ARCH" "$ROOTDIR/.flatpak-repo" "$BUNDLE" "$APP_ID" stable
|
|
echo "built $BUNDLE"
|
|
ls -lh "$BUNDLE"
|
|
echo
|
|
echo "install: flatpak install --user -y $BUNDLE"
|
|
echo "run: flatpak run $APP_ID (or: flatpak run $APP_ID --connect host:port)"
|