Skip to content

Commit

Permalink
fix: upgrade cargo dep to 0.65
Browse files Browse the repository at this point in the history
using cargo crate at 0.64 was causing some tests to compile crates with rustc 1.63, which is incompatible with workspace inheritance
  • Loading branch information
oddgrd committed Dec 5, 2022
1 parent 4dc614e commit 014fab9
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 72 deletions.
117 changes: 49 additions & 68 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ homepage = "https://www.shuttle.rs"
anyhow = { workspace = true }
async-trait = { workspace = true }
bollard = "0.13.0"
cargo = "0.64.0"
# TODO: debug the libgit2-sys conflict with cargo-edit when upgrading cargo to 0.66
cargo = "0.65.0"
cargo-edit = { version = "0.11.6", features = ["cli"] }
cargo_metadata = "0.15.2"
chrono = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion deployer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ anyhow = { workspace = true }
async-trait = { workspace = true }
axum = { workspace = true, features = ["ws"] }
bytes = "1.3.0"
cargo = "0.64.0"
# TODO: debug the libgit2-sys conflict with cargo-edit when upgrading cargo to 0.66
cargo = "0.65.0"
cargo_metadata = "0.15.2"
chrono = { workspace = true }
clap = { version = "3.2.8", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ anyhow = { workspace = true }
async-trait = { workspace = true }
axum = { workspace = true, optional = true }
bincode = { version = "1.3.3", optional = true }
# TODO: debug the libgit2-sys conflict arising from upgrading cargo to 0.66
cargo = { version = "0.64.0", optional = true }
# TODO: debug the libgit2-sys conflict with cargo-edit when upgrading cargo to 0.66
cargo = { version = "0.65.0", optional = true }
cargo_metadata = "0.15.2"
chrono = { workspace = true }
crossbeam-channel = "0.5.6"
Expand Down

0 comments on commit 014fab9

Please sign in to comment.