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

specfile: fix system-reinstall-bootc cargo build invocation #1124

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

jeckersb
Copy link
Contributor

Previously this was just running a "normal" cargo build a second
time, and overwriting the rhsm feature flags in the main bootc binary

Resolves: BIFROST-658

Signed-off-by: John Eckersberg jeckersb@redhat.com

Copy link
Contributor

@ckyrouac ckyrouac left a comment

Choose a reason for hiding this comment

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

looks sane to me, I'm not sure why the rpm builds are failing in CI, but that appears to be unrelated.

@jeckersb
Copy link
Contributor Author

looks sane to me, I'm not sure why the rpm builds are failing in CI, but that appears to be unrelated.

I think it's something to do with the vendoring stuff that @cgwalters did in #1068, I need to dig into the job to see how exactly it's handling that when running out of git

@jeckersb
Copy link
Contributor Author

I want to make sure that the el9 builds work before merging this, since I'm not 100% positive that the %cargo_build macro is going to happily accept the flags as I've done it here. I could just go manually test it, but I'll fix CI and make sure it works here.

@jeckersb
Copy link
Contributor Author

Looks like #1125 is enough to fix CI, once that lands I'll rebase this and let CI sanity check things.

@jeckersb
Copy link
Contributor Author

I want to make sure that the el9 builds work before merging this, since I'm not 100% positive that the %cargo_build macro is going to happily accept the flags as I've done it here. I could just go manually test it, but I'll fix CI and make sure it works here.

Yep the el9 macro is broken, trying to figure out the right incantation to correct for that...

Previously this was just running a "normal" `cargo build` a second
time, and overwriting the rhsm feature flags in the main bootc binary

Resolves: BIFROST-658

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
@jeckersb jeckersb merged commit 1518855 into containers:main Feb 19, 2025
23 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.

2 participants