Skip to content

enhancement: Add option to specify rust-toolchain.toml path #69

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 14, 2025
Merged

enhancement: Add option to specify rust-toolchain.toml path #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
426e06d
enhancement: Add option to specify rust-toolchain.toml path (#47)
Kubaryt Aug 27, 2025
0be57f1
combine rust-src-dir presence and rust_toolchain file presence checks
Kubaryt Aug 28, 2025
4222ef9
Set workspaces in `Swatinem/rust-cache` to rust-src-dir if cache-work…
Kubaryt Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Afterward, the `components` and `target` specified via inputs are installed in a
| `matcher` | Enable problem matcher to surface build messages and formatting issues | true |
| `rustflags` | Set the value of `RUSTFLAGS` (set to empty string to avoid overwriting existing flags) | "-D warnings" |
| `override` | Setup the last installed toolchain as the default via `rustup override` | true |
| `rust-toolchain-dir` | Path from root directory to directory with the rust toolchain file (if its not in the root of the repository) | |

[`Swatinem/rust-cache`]: https://github.com/Swatinem/rust-cache

Expand Down
9 changes: 8 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ inputs:
description: "Setup the last installed toolchain as the default via `rustup override`"
required: false
default: "true"
rust-toolchain-dir:
description: "Specify path from root directory to the directory to search for rust-toolchain.toml file. By default root directory will be used."
required: false

outputs:
rustc-version:
Expand Down Expand Up @@ -163,14 +166,18 @@ runs:
targets: ${{inputs.target}}
components: ${{inputs.components}}
override: ${{inputs.override}}
rust_toolchain_dir: ${{inputs.rust-toolchain-dir}}
shell: bash
run: |
if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml" ) ]]
if [[ -z "$toolchain" && ( -f "rust-toolchain" || -f "rust-toolchain.toml" || -f "$rust_toolchain_dir/rust-toolchain.toml") ]]
then
# Install the toolchain as specified in the file
# rustup show is the old way that implicitly installed a toolchain
# rustup toolchain install is the new explicit way
# https://github.com/rust-lang/rustup/issues/3635#issuecomment-2343511297
if [[ -n "$rust_toolchain_dir" ]]; then
cd "$rust_toolchain_dir"
fi
rustup show active-toolchain || rustup toolchain install
if [[ -n $components ]]; then
rustup component add ${components//,/ }
Expand Down
Loading