Skip to content
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.

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

manifest: extract tomlPkgsFor() helper and fix ordering #862

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

mvo5
Copy link
Contributor

@mvo5 mvo5 commented Aug 16, 2024

The current code will install python3-toml on fedora and also
on rhel11 (once it comes out) because that is the default for
unhandled distros. With tomlib in the stdlib this is no
longer needed.

[draft as it has no test(s)]

@mvo5 mvo5 requested a review from achilleas-k August 16, 2024 09:00
@mvo5 mvo5 marked this pull request as ready for review August 16, 2024 09:00
pkg/manifest/os.go Outdated Show resolved Hide resolved
@mvo5 mvo5 marked this pull request as draft August 16, 2024 09:01
pkg/manifest/os.go Outdated Show resolved Hide resolved
pkg/manifest/os.go Outdated Show resolved Hide resolved
@achilleas-k
Copy link
Member

achilleas-k commented Aug 16, 2024

Let's bump the osbuild commit ID to 5401e7a628ec2653b33a17053521cfd257b4cc40, the HEAD of the branch for osbuild/osbuild#1851, in this PR draft or open another one, as an extra verification that our image definitions actually work with all the toml changes and general madness.

Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

Typo

pkg/manifest/os.go Outdated Show resolved Hide resolved
pkg/manifest/os.go Outdated Show resolved Hide resolved
pkg/manifest/os.go Outdated Show resolved Hide resolved
@mvo5 mvo5 force-pushed the clarify-toml-in-rh10 branch 2 times, most recently from 15baaa3 to 59b2226 Compare August 20, 2024 07:33
@mvo5 mvo5 requested a review from achilleas-k August 20, 2024 07:34
@mvo5 mvo5 marked this pull request as ready for review August 20, 2024 07:34
The code is a bit too terse for my liking right now and does
just have an empty `case DISTO_EL10` - so this commit adds a
comment.
The current code will install python3-toml on fedora and also
on rhel11 (once it comes out) because that is the default for
unhandled distros.

This commit makes the various toml libs for each distro more
explicit, see also osbuild/osbuild#1851
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

Good stuff. Thank you!

For reference, I had a look at the package selection diff this PR introduces and the only change is that Fedora iot commits/containers that embed containers now use the python3-tomli-w library instead of python3-toml.

@achilleas-k achilleas-k added this pull request to the merge queue Oct 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 8, 2024
@mvo5 mvo5 added this pull request to the merge queue Oct 9, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 9, 2024
@achilleas-k
Copy link
Member

Some job on the merge queue got stuck, didn't even start, just appears in a paused/waiting state. Weird!

@achilleas-k achilleas-k added this pull request to the merge queue Oct 11, 2024
Merged via the queue into osbuild:main with commit ebe5fd3 Oct 11, 2024
17 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants