提交 23de49c3 authored 作者: Serhij S's avatar Serhij S

toolchain fixed to 1.66

上级 ed7d07af
...@@ -18,7 +18,7 @@ jobs: ...@@ -18,7 +18,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: cargo test - name: cargo test
run: cargo test --verbose --all-features --all-targets --features openssl-vendored run: cargo test --all-features --all-targets --features openssl-vendored
fmt: fmt:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
......
...@@ -18,10 +18,10 @@ features = ["full", "eva-common/openssl-no-fips"] ...@@ -18,10 +18,10 @@ features = ["full", "eva-common/openssl-no-fips"]
[dependencies] [dependencies]
binrw = "0.13.3" binrw = "0.13.3"
bma-ts = { version = "0.1.11", features = ["serde"] } bma-ts = { version = "0.1.12", features = ["serde"] }
colored = "2.1.0" colored = "1"
libc = "0.2.153" libc = "0.2.153"
nix = { version = "0.28.0", features = ["signal"] } nix = { version = "0.27", features = ["signal"] }
object-id = "0.1.3" object-id = "0.1.3"
oneshot = { version = "0.1.6", default-features = false, features = ["std"] } oneshot = { version = "0.1.6", default-features = false, features = ["std"] }
parking_lot = "0.12.1" parking_lot = "0.12.1"
...@@ -30,25 +30,25 @@ rmodbus = { version = "0.9.4", optional = true } ...@@ -30,25 +30,25 @@ rmodbus = { version = "0.9.4", optional = true }
roboplc-derive = { version = "0.1.9" } roboplc-derive = { version = "0.1.9" }
serde = { version = "1.0.197", features = ["derive", "rc"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serial = "0.4.0" serial = "0.4.0"
sysinfo = "0.30.6" sysinfo = "0.29"
thiserror = "1.0.57" thiserror = "1.0.57"
tracing = "0.1.40" tracing = "0.1.40"
signal-hook = "0.3.17" signal-hook = "0.3.17"
eva-common = { version = "0.3.49", features = ["events", "payload", "common-payloads", "acl"], optional = true } eva-common = { version = "0.3.51", features = ["events", "payload", "common-payloads", "acl"], optional = true }
eva-sdk = { version = "0.3.45", features = ["controller"], optional = true } eva-sdk = { version = "0.3.45", features = ["controller"], optional = true }
busrt = { version = "0.4.9", features = ["rpc", "ipc"], optional = true } busrt = { version = "0.4.9", features = ["rpc", "ipc"], optional = true }
tokio = { version = "1.36.0", optional = true } tokio = { version = "1.36.0", optional = true }
hostname = { version = "0.3.1", optional = true } hostname = { version = "0.3.1", optional = true }
env_logger = "0.11.3" env_logger = "0.10"
log = "0.4.21" log = "0.4.21"
metrics-exporter-prometheus = { version = "0.14.0", optional = true, default-features = false, features = ["http-listener"] } metrics-exporter-prometheus = { version = "0.14.0", optional = true, default-features = false, features = ["http-listener"] }
metrics = { version = "0.22.3", optional = true } metrics = { version = "0.22.3", optional = true }
[features] [features]
eapi = ["dep:eva-common", "dep:eva-sdk", "dep:busrt", "dep:tokio", "dep:hostname"] eapi = ["eva-common", "eva-sdk", "busrt", "tokio", "hostname"]
modbus = ["dep:rmodbus"] modbus = ["rmodbus"]
openssl-vendored = ["busrt/openssl-vendored", "eva-common/openssl-vendored"] openssl-vendored = ["busrt/openssl-vendored", "eva-common/openssl-vendored"]
metrics = ["dep:metrics", "dep:metrics-exporter-prometheus"] metrics = ["dep:metrics", "metrics-exporter-prometheus"]
full = ["eapi", "modbus", "metrics"] full = ["eapi", "modbus", "metrics"]
[dev-dependencies] [dev-dependencies]
......
[toolchain]
channel = "1.66.0"
...@@ -64,7 +64,7 @@ impl DataDeliveryPolicy for PushPayload { ...@@ -64,7 +64,7 @@ impl DataDeliveryPolicy for PushPayload {
} }
/// EAPI connection configuration /// EAPI connection configuration
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]
pub struct EAPIConfig<D, V> pub struct EAPIConfig<D, V>
where where
D: DataDeliveryPolicy + Clone + Send + Sync + 'static, D: DataDeliveryPolicy + Clone + Send + Sync + 'static,
......
...@@ -12,7 +12,7 @@ use std::{ ...@@ -12,7 +12,7 @@ use std::{
thread::{self, JoinHandle, Scope, ScopedJoinHandle}, thread::{self, JoinHandle, Scope, ScopedJoinHandle},
time::Duration, time::Duration,
}; };
use sysinfo::{Pid, System}; use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};
use tracing::warn; use tracing::warn;
static REALTIME_MODE: AtomicBool = AtomicBool::new(true); static REALTIME_MODE: AtomicBool = AtomicBool::new(true);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论