Add rust-toolchain.toml and pin to a working nightly #502
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicholasbishop
force-pushed
the
bishop-toolchain-file-2
branch
3 times, most recently
from
df039a5 to
154d4bf
Compare
|
Thanks @phip1611 for the suggestion to use |
|
I'm in favor of this! Will approve once the comments are addressed. Thanks for working on this! |
Double-checking -- I don't see any review comments here, maybe still in draft form? |
Oh no. I ran into this issue: community/community#10369 Should be fine now |
phip1611
requested changes
Sep 5, 2022
nicholasbishop
force-pushed
the
bishop-toolchain-file-2
branch
3 times, most recently
from
c083e9a to
d30b454
Compare
phip1611
approved these changes
Sep 6, 2022
rust-toolchain.toml
Outdated
| # don't have miri available though, so pin to a slightly older version. | ||
| channel = "nightly-2022-08-26" | ||
| components = [ | ||
| # Needed for `-Zbuild-std`. |
There was a problem hiding this comment.
very minor nit: probably you can add a comment here
"additive components to the default profile" or so
Feel free to merge with or without this!
Add a `rust-toolchain.toml` file that specifies the channel and components needed to build uefi-rs. See https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file for documentation of the `rust-toolchain.toml` format. Remove the `--toolchain` option from `xtask`, as using this file is a simpler alternative. Also remove the instructions for installing the nightly toolchain from the readme, as `rustup` will do this automatically now. The template application has been updated to add a `rust-toolchain.toml`, and `BUILDING.md` has been updated to mention it as well. The `toolchain` action previously used in the CI is unmaintained and doesn't understand `rust-toolchain.toml` (it does understand the older `rust-toolchain` file, but that doesn't allow for including required components). Since the runners come with rustup already installed, we don't actually need a complex action here anyway, so just remove those sections entirely. A few jobs need extra components installed, do that with `rustup component add`. Note that this change will also cause `xtask` itself to be built with nightly. That should generally be fine, we only had it using stable because of rust-osdev#397, and in the future we can easily temporarily pin to a non-current nightly if a bug occurs with an `xtask` dependency again. Fixes rust-osdev#498
Temporarily modify rust-toolchain.toml to pin to `nightly-2022-08-26`, as compilation is broken on current nightly due to rust-osdev#500. `nightly-2022-09-01` is the most recent nightly that avoids the bug, but it doesn't have miri (which is run by CI), so pin to a slightly older version. Also pinned the toolchain in the template app. This change should be reverted once rust-osdev#500 is fixed.
nicholasbishop
force-pushed
the
bishop-toolchain-file-2
branch
from
d30b454 to
7a936fd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(See the two commits for more details)