diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index a846032ec..b40b63252 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -44,7 +44,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.81.0 override: true components: rustfmt, clippy diff --git a/rust-tui/Cargo.lock b/rust-tui/Cargo.lock index 326fdb130..aa7b3113d 100644 --- a/rust-tui/Cargo.lock +++ b/rust-tui/Cargo.lock @@ -448,9 +448,9 @@ dependencies = [ [[package]] name = "dittolive-ditto" -version = "4.10.0" +version = "4.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6133ccc415b94298d9d7d889a0f7ee91b70e249dfff24df2a99e704ca3c9c2" +checksum = "9e1c20939abecb755f51c28a42f7ff024e7649a23c16644abe50a9e3e0743281" dependencies = [ "base64", "bytemuck", @@ -482,9 +482,9 @@ dependencies = [ [[package]] name = "dittolive-ditto-sys" -version = "4.10.0" +version = "4.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842bca58e74c22f03b326f129c27d99e29b7e48b8b6152da45b328ce22cda549" +checksum = "4da62bc7567a759c562f186192d6a78e06ee91dc40137179aee13ee23d00244d" dependencies = [ "macro_rules_attribute", "paste", diff --git a/rust-tui/Cargo.toml b/rust-tui/Cargo.toml index 3f66af04e..47f62605e 100644 --- a/rust-tui/Cargo.toml +++ b/rust-tui/Cargo.toml @@ -14,7 +14,7 @@ path = "src/bin/main.rs" [dependencies] # Ditto dependenceis -dittolive-ditto = "4.10.0" +dittolive-ditto = "4.10.2" # External dependencies anyhow = "1" @@ -33,4 +33,3 @@ tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } tokio-stream = { version = "0.1.17", features = ["sync"] } uuid = "1.13" - diff --git a/rust-tui/build.rs b/rust-tui/build.rs new file mode 100644 index 000000000..1ff8aff7b --- /dev/null +++ b/rust-tui/build.rs @@ -0,0 +1,6 @@ +fn main() { + // Workaround for "multiple definition" linker errors on Linux (#SDKS-1088) + if cfg!(target_os = "linux") { + println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition"); + } +} diff --git a/rust-tui/rust-toolchain b/rust-tui/rust-toolchain new file mode 100644 index 000000000..dbd41264a --- /dev/null +++ b/rust-tui/rust-toolchain @@ -0,0 +1 @@ +1.81.0