mirror of
https://github.com/spacedriveapp/spacedrive
synced 2024-07-07 03:13:30 +00:00
make rust 1.64 requirement more concrete
This commit is contained in:
parent
d13248b2f1
commit
fe497ce104
6
Cargo.lock
generated
6
Cargo.lock
generated
|
@ -3438,7 +3438,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "prisma-client-rust"
|
||||
version = "0.6.1"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
|
||||
dependencies = [
|
||||
"base64 0.13.0",
|
||||
"bigdecimal",
|
||||
|
@ -3467,7 +3467,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "prisma-client-rust-cli"
|
||||
version = "0.6.1"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
|
||||
dependencies = [
|
||||
"datamodel",
|
||||
"prisma-client-rust-sdk",
|
||||
|
@ -3482,7 +3482,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "prisma-client-rust-sdk"
|
||||
version = "0.6.1"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
|
||||
source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
|
||||
dependencies = [
|
||||
"convert_case 0.5.0",
|
||||
"datamodel",
|
||||
|
|
|
@ -13,5 +13,5 @@ resolver = "2"
|
|||
openssl-sys = { git = "https://github.com/spacedriveapp/rust-openssl" }
|
||||
|
||||
[patch."https://github.com/Brendonovich/prisma-client-rust.git"]
|
||||
prisma-client-rust = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536" }
|
||||
prisma-client-rust-cli = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536" }
|
||||
prisma-client-rust = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6" }
|
||||
prisma-client-rust-cli = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6" }
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
name = "sdcore-lib"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.63.0"
|
||||
rust-version = "1.64.0"
|
||||
|
||||
[lib]
|
||||
name = "sdcore"
|
||||
|
|
|
@ -6,7 +6,7 @@ authors = ["Spacedrive Technology Inc."]
|
|||
license = "GNU GENERAL PUBLIC LICENSE"
|
||||
repository = "https://github.com/spacedriveapp/spacedrive"
|
||||
edition = "2021"
|
||||
rust-version = "1.63.0"
|
||||
rust-version = "1.64.0"
|
||||
|
||||
[features]
|
||||
default = ["p2p"]
|
||||
|
@ -15,7 +15,8 @@ p2p = [
|
|||
mobile = [
|
||||
] # This feature allows features to be disabled when the Core is running on mobile.
|
||||
ffmpeg = [
|
||||
"dep:ffmpeg-next", "dep:thumbnailer"
|
||||
"dep:ffmpeg-next",
|
||||
"dep:thumbnailer",
|
||||
] # This feature controls whether the Spacedrive Core contains functionality which requires FFmpeg.
|
||||
|
||||
[dependencies]
|
||||
|
|
|
@ -22,13 +22,18 @@ pub async fn load_and_migrate(db_url: &str) -> Result<PrismaClient, MigrationErr
|
|||
.map_err(Box::new)?;
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
client
|
||||
._db_push(
|
||||
std::env::var("SD_FORCE_RESET_DB")
|
||||
{
|
||||
let mut builder = client._db_push();
|
||||
|
||||
if std::env::var("SD_FORCE_RESET_DB")
|
||||
.map(|v| v == "true")
|
||||
.unwrap_or(false),
|
||||
)
|
||||
.await?;
|
||||
.unwrap_or(false)
|
||||
{
|
||||
builder = builder.force_reset();
|
||||
}
|
||||
|
||||
builder.await?;
|
||||
}
|
||||
|
||||
#[cfg(not(debug_assertions))]
|
||||
client._migrate_deploy().await?;
|
||||
|
|
Loading…
Reference in a new issue