Skip to content

builder-manifest: Log sdk, runtime and base versions and commits used #667

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
swick merged 1 commit into from
Sep 15, 2025
Merged

builder-manifest: Log sdk, runtime and base versions and commits used #667

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
18 changes: 18 additions & 0 deletions src/builder-manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,12 @@ builder_manifest_start (BuilderManifest *self,
self->sdk,
builder_manifest_get_runtime_version (self));

if (self->sdk_commit != NULL)
g_debug ("Using %s version %s commit %s",
Comment on lines +1711 to +1712
Copy link
Contributor

@swick swick Sep 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The gnome handbook says that one should use parenthesis if there are multiple lines. I know that this is not followed consistently in flatpak-related project, but I wonder if we should enforce this.

Copy link
Contributor Author

@bbhtt bbhtt Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't have a strong opinion on this, but it is even inconsistent in this file. the instances i could spot except a few are not using braces.

self->sdk,
builder_manifest_get_runtime_version (self),
self->sdk_commit);

sdk_path = flatpak_info_show_path (self->sdk, builder_manifest_get_runtime_version (self), context);
if (sdk_path != NULL &&
!builder_context_load_sdk_config (context, sdk_path, error))
Expand All @@ -1720,13 +1726,25 @@ builder_manifest_start (BuilderManifest *self,
self->runtime,
builder_manifest_get_runtime_version (self));

if (self->runtime_commit != NULL)
g_debug ("Using %s version %s commit %s",
self->runtime,
builder_manifest_get_runtime_version (self),
self->runtime_commit);

if (self->base != NULL && *self->base != 0)
{
self->base_commit = flatpak (NULL, "info", arch_option, "--show-commit", self->base,
builder_manifest_get_base_version (self), NULL);
if (!download_only && self->base_commit == NULL)
return flatpak_fail (error, "Unable to find app %s version %s",
self->base, builder_manifest_get_base_version (self));

if (self->base_commit != NULL)
g_debug ("Using %s version %s commit %s",
self->base,
builder_manifest_get_base_version (self),
self->base_commit);
}

if (!expand_modules (context, self->modules, &self->expanded_modules, names, error))
Expand Down