Skip to content

rust-tui: Update Ditto SDK to 4.10.2 and Use Rust 1.81.0 #67

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

rust-tui: Update Ditto SDK to 4.10.2 and Use Rust 1.81.0 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a5c95df
rust-tui: Update Ditto SDK dependency to 4.10.2
kristopherjohnson May 15, 2025
ebc3372
Add rust-toolchain which matches the Rust 4.10.2 SDK
kristopherjohnson May 15, 2025
262b8eb
Use Rust 1.81.0 in GitHub actions, to ensure compatibility with 4.10.…
kristopherjohnson May 20, 2025
a40b0bd
Pass `--allow-multiple-definition` to linker for rust-tui Linux builds
kristopherjohnson May 20, 2025
3353f38
Fix rust-tui linker flags for Linux
kristopherjohnson May 20, 2025
72e89a1
rust-tui: Move Linux linker option setting to build.rs
kristopherjohnson May 20, 2025
206ec83
Add issue number to workaround comment
kristopherjohnson May 20, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
toolchain: 1.81.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to source this from the rust-toolchain file to avoid a duplicate source of truth?

override: true
components: rustfmt, clippy

Expand Down
8 changes: 4 additions & 4 deletions rust-tui/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions rust-tui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this removal of a trailing new line intentional?

6 changes: 6 additions & 0 deletions rust-tui/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
fn main() {
// Workaround for "multiple definition" linker errors on Linux (#SDKS-1088)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this fix just needed for our specific CI setup or something that customers should understand how to apply to their own setups? A bit more context could help when someone is reading this code who is not familiar with this issue.

if cfg!(target_os = "linux") {
println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
}
}
1 change: 1 addition & 0 deletions rust-tui/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.81.0
Loading