Skip to content

fix: ensure toolchain components are installed, even if artifacts exist #114

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
schell merged 2 commits into from
Sep 20, 2025
Merged

fix: ensure toolchain components are installed, even if artifacts exist #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31153a8
fix: ensure toolchain components are installed, even if artifacts exist
schell Sep 20, 2025
87c8bcd
clippy fixes
schell Sep 20, 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
14 changes: 7 additions & 7 deletions crates/cargo-gpu/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ package = "rustc_codegen_spirv"
let target_spec_dir = update_target_specs_files(&source, &dummy_metadata, !skip_rebuild)
.context("writing target spec files")?;

if !skip_rebuild {
log::debug!("ensure_toolchain_and_components_exist");
crate::install_toolchain::ensure_toolchain_and_components_exist(
&toolchain_channel,
self.auto_install_rust_toolchain,
)
.context("ensuring toolchain and components exist")?;
log::debug!("ensure_toolchain_and_components_exist");
crate::install_toolchain::ensure_toolchain_and_components_exist(
&toolchain_channel,
self.auto_install_rust_toolchain,
)
.context("ensuring toolchain and components exist")?;

if !skip_rebuild {
// to prevent unsupported version errors when using older toolchains
if !source.is_path() {
log::debug!("remove Cargo.lock");
Expand Down
4 changes: 1 addition & 3 deletions crates/cargo-gpu/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,8 @@ impl Command {
command.build.watch = false;
command.run()?;
command.build.watch = true;
command.run()?;
} else {
command.run()?;
}
command.run()?;
}
Self::Show(show) => show.run()?,
Self::DumpUsage => dump_full_usage_for_readme()?,
Expand Down
Loading