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

build.sh: remove edk2-ovmf version freeze #3818

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

yasminvalim
Copy link
Contributor

We temporarily froze updates to that version due to issues with the FCOS PXE 4K UEFI tests. You can check it here: #3816.

Now that we had a update to fix it, we can switch back to the latest version.

@jlebon
Copy link
Member

jlebon commented Jun 6, 2024

This is totally fine, though a more idiomatic way to do this would be to use git revert to revert the commit that froze the package. That makes it more obvious that it's a revert and links to the original commit. But still add to the generated commit message more information about why we can now revert the commit.

Also, can you make sure that your commit messages wrap at some reasonable column (usually 72)?

@yasminvalim
Copy link
Contributor Author

This is totally fine, though a more idiomatic way to do this would be to use git revert to revert the commit that froze the package. That makes it more obvious that it's a revert and links to the original commit. But still add to the generated commit message more information about why we can now revert the commit.

Also, can you make sure that your commit messages wrap at some reasonable column (usually 72)?

Thanks! I updated the commit to be a revert. I've left the default revert message. Let me know if it's okay.

@yasminvalim yasminvalim force-pushed the remove-freezed-edk2 branch 3 times, most recently from 85390fc to 0b5f3fa Compare June 6, 2024 20:37
This reverts commit f056c0e.

The package has been fixed and update so we are able to
revert this to start to use the latest version.

Closes: coreos#3815
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2290441
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for working on this!

@jlebon jlebon enabled auto-merge (rebase) June 6, 2024 20:40
@jlebon
Copy link
Member

jlebon commented Jun 6, 2024

Prow will likely fail on openshift/os#1523 (comment); we can override it if so.

@jlebon
Copy link
Member

jlebon commented Jun 7, 2024

/override ci/prow/rhcos

Copy link

openshift-ci bot commented Jun 7, 2024

@jlebon: Overrode contexts on behalf of jlebon: ci/prow/rhcos

In response to this:

/override ci/prow/rhcos

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jlebon jlebon merged commit 8a35404 into coreos:main Jun 7, 2024
5 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