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

Update Cargo.lock to prevent nightly breakage #129

Merged
merged 1 commit into from
Sep 29, 2020

Conversation

josephlr
Copy link
Contributor

@josephlr josephlr commented Sep 29, 2020

See rust-osdev/x86_64#186 (comment)

Now that x86_64 has a "good" build, we just need a new lockfile to make things build.

Signed-off-by: Joe Richey joerichey@google.com

@phil-opp
Copy link
Member

Thanks! Could you also update the Cargo.lock files in example-kernel and test-kernel (these are also built in our current test framework).

@josephlr
Copy link
Contributor Author

@phil-opp This needs to be force merged

Thanks! Could you also update the Cargo.lock files in example-kernel and test-kernel (these are also built in our current test framework).

Done

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

Thanks!

@josephlr
Copy link
Contributor Author

Thanks!

@phil-opp It looks like one of the tests got (inadvertently) cancelled. I don't have permissions to rerun them.

Signed-off-by: Joe Richey <joerichey@google.com>
@phil-opp
Copy link
Member

Seems like the Windows job is having some problems downloading QEMU. I already restarted it once after seeing the same issue. Let's try it again…

@josephlr
Copy link
Contributor Author

Seems like the Windows job is having some problems downloading QEMU. I already restarted it once after seeing the same issue. Let's try it again…

Looks like a network failure. The Windows test consistently fails in downloading (the link works just fine for me locally though)

@phil-opp
Copy link
Member

I also just tried it locally and it worked for me too. I'm not sure what we should do about this. I'm inclined to force-merge and publish to unblock the nightly features, but on the other hand it feels not good to publish a new version without a passing CI.

@josephlr
Copy link
Contributor Author

I also just tried it locally and it worked for me too. I'm not sure what we should do about this. I'm inclined to force-merge and publish to unblock the nightly features, but on the other hand it feels not good to publish a new version without a passing CI.

It's building and all the other tests and stuff are passing. The downside here is that without this change, the CI's for all the other projects aren't going to pass. Given that this would be the only change for 0.9.11. I think force merging is OK.

@phil-opp
Copy link
Member

Thanks! Ok, then let's do this.

@phil-opp phil-opp merged commit bd17c42 into rust-osdev:master Sep 29, 2020
phil-opp added a commit that referenced this pull request Sep 29, 2020
@phil-opp
Copy link
Member

Published as v0.9.11

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.

None yet

2 participants