Skip to content

Commit

Permalink
Merge pull request #58 from itsparser/v3
Browse files Browse the repository at this point in the history
Fixed the Conflict version across service and cargo
  • Loading branch information
itsparser authored Feb 19, 2024
2 parents 1cc9424 + 5a7b4f8 commit ef8f2b0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .cargo/config.local.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
# Environments variables set for all `cargo ...` commands.
[env]

DEBUG=false
DEBUG="true"

# Scope down tracing, to filter out external lib tracing.
RUST_LOG="cerium=debug,entity=debug,migration=info,api=debug"

## -- Database Url
DATABASE_URI="postgres://root:root@localhost:5432/orca"
DATABASE_URI="postgres://root:root@localhost:5433/orca"
SELENIUM_URI="http://localhost:4444/wd/hub/session"

MINIO_ACCESS_KEY = "minioadmin"
MINIO_ACCESS_SECRET = "minioadmin"
STORAGE_BASE_URL = "http://localhost:9000"
STORAGE_ACCESS_KEY = "minioadmin"
STORAGE_ACCESS_SECRET = "minioadmin"

# -- Encryption salt used for JWT token and other secret keys
ENCRYPTION_SALT="strongencryption"
Expand Down
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ geckodriver="0.34.0"

[patch.crates-io]
sea-orm = { git="https://github.com/itsparser/sea-orm", branch = "master" }
sea-orm-migration = { git="https://github.com/itsparser/sea-orm", branch = "master" }

6 changes: 5 additions & 1 deletion crates/services/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ futures-util.workspace=true
config.workspace=true
chrono.workspace=true

sea-orm.workspace=true
sea-orm.workspace =true
sea-query.workspace=true
sea-orm-migration.workspace=true
axum.workspace=true
Expand All @@ -41,3 +41,7 @@ async-recursion = "1.0.5"

tokio = { version = "1.0", features = ["full"] }


#[patch.crates-io]
#sea-orm = { git="https://github.com/itsparser/sea-orm", branch = "master" }

0 comments on commit ef8f2b0

Please sign in to comment.