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

Fix versions #1187

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Fix versions #1187

merged 1 commit into from
Jun 20, 2024

Conversation

LightAndLight
Copy link
Contributor

Depends on #1186

uefi 0.28 was released from commit 255359a. The tree for that commit
doesn't contain ResetNotificationProtocol, even though the changelog
says it does. ResetNotificationProtocol was added in commit 04be50f,
which was merged in commit 0c533bd - both occurring after 0.28 was
released.

This commit fixes those issues, and bumps the unreleased crate versions
so that I can depend on them before this commit is released.

@nicholasbishop
Copy link
Contributor

Oops, thanks for catching this. I think the only change needed here is fixing the changelogs -- can you amend the commit to remove the other version changes? We don't bump the package versions until we make a new release. You should still be able to use the not-yet-released version locally with [patch.crates-io] and git or path dependencies.

@LightAndLight
Copy link
Contributor Author

Done

@phip1611
Copy link
Contributor

thanks!

@phip1611 phip1611 enabled auto-merge June 11, 2024 16:39
@phip1611 phip1611 added this pull request to the merge queue Jun 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jun 11, 2024
@nicholasbishop
Copy link
Contributor

nicholasbishop commented Jun 14, 2024

I pushed a fix for the merge conflict. Seems CI is failing for unrelated reasons on the nightly test: #1205

`uefi` 0.28 was released from commit 255359a. The tree for that commit
doesn't contain `ResetNotificationProtocol`, even though the changelog
says it does. `ResetNotificationProtocol` was added in commit 04be50f,
which was merged in commit `0c533bd` - both occurring after 0.28 was
released.
@nicholasbishop nicholasbishop added this pull request to the merge queue Jun 20, 2024
Merged via the queue into rust-osdev:main with commit e7fe63f Jun 20, 2024
12 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