Skip to content

Respect the lockfile #948

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
ascjones merged 3 commits into from
Feb 3, 2023
Merged

Respect the lockfile #948

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a611be
Respect the lockfile
ascjones Feb 3, 2023
d0e94e3
Merge branch 'master' into aj/lockfile
ascjones Feb 3, 2023
e37842e
CHANGELOG.md
ascjones Feb 3, 2023
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
19 changes: 17 additions & 2 deletions crates/build/src/workspace/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ impl Workspace {
.tempdir()?;
tracing::debug!("Using temp workspace at '{}'", tmp_dir.path().display());
let new_paths = self.write(&tmp_dir)?;
let root_manifest_path = new_paths
let tmp_root_manifest_path = new_paths
.iter()
.find_map(|(pid, path)| {
if *pid == self.root_package {
Expand All @@ -210,6 +210,21 @@ impl Workspace {
}
})
.expect("root package should be a member of the temp workspace");
f(root_manifest_path)

// copy the `Cargo.lock` file
let src_lockfile = self.workspace_root.clone().join("Cargo.lock");
let dest_lockfile = tmp_root_manifest_path
.absolute_directory()?
.join("Cargo.lock");
if src_lockfile.exists() {
tracing::debug!(
"Copying '{}' to ' '{}'",
src_lockfile.display(),
dest_lockfile.display()
);
std::fs::copy(src_lockfile, dest_lockfile)?;
}

f(tmp_root_manifest_path)
}
}