builder-manifest: Prevent writing duplicate build groups#713
Merged
Conversation
bbhtt
force-pushed
the
bbhtt/dupe-metadata-2
branch
from
d69dcc3 to
d22537d
Compare
swick
approved these changes
Mar 10, 2026
Contributor
Author
|
Added a test for it but looks like there is a conflict and CI doesn't want to run... |
bbhtt
force-pushed
the
bbhtt/dupe-metadata-2
branch
from
73e2c3f to
875af0f
Compare
Previously, builder_manifest_create_platform_base() copied the SDK metadata to metadata.platform and builder_manifest_finish_platform() later appended the platform's built-extensions to it. If the SDK metadata already contained a Build group with built-extensions, this would resulted in duplicate groups and keys in the final platform metadata. Fix this by loading both metadata with GKeyFile and merging the build-extensions entries and deduplicated string values. Fixes the second issue in: #618 (comment)
bbhtt
force-pushed
the
bbhtt/dupe-metadata-2
branch
from
875af0f to
5bd2f0f
Compare
bbhtt
force-pushed
the
bbhtt/dupe-metadata-2
branch
from
5bd2f0f to
6b56177
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, builder_manifest_create_platform_base() copied the SDK
metadata to metadata.platform and builder_manifest_finish_platform()
later appended the platform's built-extensions to it. If the SDK
metadata already contained a Build group with built-extensions, this
would resulted in duplicate groups and keys in the final platform
metadata.
Fix this by loading both metadata with GKeyFile and merging the
build-extensions entries and deduplicated string values.
Fixes the second issue in:
#618 (comment)
Fixes #618