Skip to content

build_runtime: detect whether flatpak-builder install workaround is n… #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcbaker merged 1 commit into from
Aug 17, 2026
Merged

build_runtime: detect whether flatpak-builder install workaround is n… #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions flatpaker/actions/build_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from ..entry import BaseBuildArguments, BuildRuntimeArguments


def _build_runtime(args: BaseBuildArguments, sdk: pathlib.Path) -> None:
def _build_runtime(args: BaseBuildArguments, sdk: pathlib.Path,
need_platform_workaround: bool) -> None:
build_command: list[str] = [
'flatpak-builder', '--force-clean', '--user', 'build', sdk.as_posix()]

Expand All @@ -28,7 +29,7 @@ def _build_runtime(args: BaseBuildArguments, sdk: pathlib.Path) -> None:
subprocess.run(build_command, check=True)

# Work around https://github.com/flatpak/flatpak-builder/issues/630
if args.install and 'Sdk' in sdk.name:
if need_platform_workaround and args.install and 'Sdk' in sdk.name:
if '8' in sdk.name:
branch = '8'
elif '7.py2' in sdk.name:
Expand All @@ -48,6 +49,24 @@ def _build_runtime(args: BaseBuildArguments, sdk: pathlib.Path) -> None:
subprocess.run(install_command, check=True)


def _need_platform_workaround() -> bool:
"""Do we need the workaround for platform installation?

Prior to flatpak-builder 1.4.5, flatpak would only install the Sdk component
when a Platform and and Sdk are built together. This means that for the Ren'Py
platforms, only the Sdk would be installed. For later versions this is fixed,
and we don't need the workaround.
"""
out = subprocess.run(
['flatpak-builder', '--version'],
stdout=subprocess.PIPE,
text=True,
check=True,
)
raw_ver = out.stdout.rsplit('-', 1)[1]
return tuple(int(v) for v in raw_ver.split('.')) < (1, 4, 5)


def build_runtimes(args: BuildRuntimeArguments) -> bool:
command = [
'flatpak', 'install', '--no-auto-pin', '--user',
Expand All @@ -69,11 +88,12 @@ def build_runtimes(args: BuildRuntimeArguments) -> bool:

success = True

need_platform_workaround = _need_platform_workaround()
datadir = importlib.resources.files('flatpaker') / 'data'
for runtime in runtimes:
try:
with importlib.resources.as_file(datadir / runtime) as sdk:
_build_runtime(args, sdk)
_build_runtime(args, sdk, need_platform_workaround)
except Exception:
if not args.keep_going:
raise
Expand Down
Loading