Allow overriding the toolchain file #26
Merged
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
Twey
force-pushed
the
allow-overriding-toolchain-file
branch
from
80e2a95
to
5ea736b
Compare
Twey
added a commit
to Twey/linera-protocol
that referenced
this pull request
Nov 1, 2023
Since we use nightly Rust tooling for our linting, we want to override our usual toolchain for the linting step. Upstream `setup-rust-toolchain` currently doesn't allow this. I have submitted a PR at actions-rust-lang/setup-rust-toolchain#26 to add the functionality, but until then this commit points to a branch on my personal repository at https://github.com/Twey/setup-rust-toolchain/. We should revert it once the PR is merged.
Twey
added a commit
to linera-io/linera-protocol
that referenced
this pull request
Nov 1, 2023
* Switch GitHub actions to actions-rust-lang/setup-toolchain Removes explicit reference to Swatinem/rust-cache as actions-rust-lang/setup-rust-toolchain automatically uses this action to enable caching (unless we set `cache: false`). Also switches our toolchain environment to be the same as the build environment, as the `rust-toolchain.toml` file overrides it anyway. This is undesirable: nightly rustfmt has some additional options we would like to keep. * Use my branch to allow overriding the toolchain file Since we use nightly Rust tooling for our linting, we want to override our usual toolchain for the linting step. Upstream `setup-rust-toolchain` currently doesn't allow this. I have submitted a PR at actions-rust-lang/setup-rust-toolchain#26 to add the functionality, but until then this commit points to a branch on my personal repository at https://github.com/Twey/setup-rust-toolchain/. We should revert it once the PR is merged.
|
Thanks for the PR @Twey. It is included now in v1.7.0 |
|
Thanks for the review folks! Hope it helps :) |
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.
Sometimes we have a toolchain file but want to override it in some specific cases. For example, in a current project, we want to use nightly
rustfmt, so our linter step uses nightly Rust even though our main build uses stable Rust.This PR changes (and documents) the behaviour of the action in the case in which both a toolchain file and a
toolchaininput are present, preferring thetoolchaininput.