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

Fixed the Conflict version across service and cargo #58

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Fixed the Conflict version across service and cargo #58

Show file tree
Hide file tree
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: 5 additions & 4 deletions .cargo/config.local.toml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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" }

Loading