Skip to content
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

refactor: don't install next-runtime from git in local runs #718

Merged
merged 1 commit into from
Mar 16, 2023
Merged

refactor: don't install next-runtime from git in local runs #718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions cargo-shuttle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,6 @@ impl Shuttle {

trace!(?path, "installing runtime from local filesystem");

// TODO: Add --features next here when https://github.com/shuttle-hq/shuttle/pull/688 is merged
std::process::Command::new("cargo")
.arg("install")
.arg("shuttle-runtime")
Expand All @@ -493,22 +492,16 @@ impl Shuttle {
.expect("failed to install the shuttle runtime");
} else {
// If the version of cargo-shuttle is different from shuttle-runtime,
// or it isn't installed, try to install shuttle-runtime from the production
// branch.
// or it isn't installed, try to install shuttle-runtime from crates.io.
if let Err(err) = check_version(&runtime_path) {
warn!("{}", err);

trace!("installing shuttle-runtime");
// TODO: Add --features next here when https://github.com/shuttle-hq/shuttle/pull/688 is merged
std::process::Command::new("cargo")
.arg("install")
.arg("shuttle-runtime")
.arg("--bin")
.arg("shuttle-next")
.arg("--git")
.arg("https://github.com/shuttle-hq/shuttle")
.arg("--branch")
.arg("production")
.arg("--features")
.arg("next")
.output()
Expand Down