ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-05 09:20:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Rust, Diesel CLI and dev. environment.

Browse Source
This commit is contained in:
Orne Brocaar 2024-06-18 13:56:31 +01:00
parent 38d544a5f7
commit 3b95a413a6
4 changed files with 212 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -8,7 +8,7 @@ dist:
# Install dev dependencies # Install dev dependencies
dev-dependencies: dev-dependencies:
cargo install cross --version 0.2.5 cargo install cross --version 0.2.5
cargo install diesel_cli --version 2.1.1 --no-default-features --features postgres cargo install diesel_cli --version 2.2.1 --no-default-features --features postgres
cargo install cargo-deb --version 1.43.1 cargo install cargo-deb --version 1.43.1
cargo install cargo-generate-rpm --version 0.12.1 cargo install cargo-generate-rpm --version 0.12.1

30
chirpstack/Cargo.toml
View File

@ -33,7 +33,11 @@ diesel = { version = "2.1", features = [
"postgres_backend", "postgres_backend",
] } ] }
diesel_migrations = { version = "2.1" } diesel_migrations = { version = "2.1" }
diesel-async = { version = "0.4", features = ["deadpool", "postgres", "async-connection-wrapper"] } diesel-async = { version = "0.4", features = [
"deadpool",
"postgres",
"async-connection-wrapper",
] }
tokio-postgres = "0.7" tokio-postgres = "0.7"
tokio-postgres-rustls = "0.11" tokio-postgres-rustls = "0.11"
bigdecimal = "0.4" bigdecimal = "0.4"
@ -49,8 +53,17 @@ tracing-subscriber = { version = "0.3", features = [
], default-features = true } ], default-features = true }
# ChirpStack API definitions # ChirpStack API definitions
chirpstack_api = { path = "../api/rust", features = ["default", "internal", "diesel"] } chirpstack_api = { path = "../api/rust", features = [
lrwn = { path = "../lrwn", features = ["serde", "diesel", "regions", "crypto"] } "default",
"internal",
"diesel",
] }
lrwn = { path = "../lrwn", features = [
"serde",
"diesel",
"regions",
"crypto",
] }
backend = { path = "../backend" } backend = { path = "../backend" }
# HTTP # HTTP
@ -69,7 +82,10 @@ gcp_auth = "0.11"
lapin = "2.3" lapin = "2.3"
tokio-executor-trait = "2.1" tokio-executor-trait = "2.1"
tokio-reactor-trait = "1.1" tokio-reactor-trait = "1.1"
rdkafka = { version = "0.36", default-features = false, features = ["tokio", "cmake-build"] } rdkafka = { version = "0.36", default-features = false, features = [
"tokio",
"cmake-build",
] }
# gRPC and Protobuf # gRPC and Protobuf
tonic = "0.11" tonic = "0.11"
@ -146,7 +162,11 @@ bytes = "1.5"
dotenv = "0.15" dotenv = "0.15"
[features] [features]
test-all-integrations = ["test-integration-amqp", "test-integration-kafka", "test-integration-mqtt"] test-all-integrations = [
"test-integration-amqp",
"test-integration-kafka",
"test-integration-mqtt",
]
test-integration-amqp = [] test-integration-amqp = []
test-integration-kafka = [] test-integration-kafka = []
test-integration-mqtt = [] test-integration-mqtt = []

2
rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "1.78.0" channel = "1.79.0"
components = ["rustfmt", "clippy"] components = ["rustfmt", "clippy"]
profile = "default" profile = "default"

2
shell.nix
View File

@ -1,4 +1,4 @@
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-23.11.tar.gz") {} }: { pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-24.05.tar.gz") {} }:
pkgs.mkShell { pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [