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

fix: lock version of hickory-client #6716

Merged
merged 2 commits into from
Dec 9, 2024
Merged

fix: lock version of hickory-client #6716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5cfe33
mvp
Misieq01 Dec 6, 2024
4cf1fee
add hickory-proto to machete ignored
Misieq01 Dec 9, 2024
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: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

10 changes: 9 additions & 1 deletion base_layer/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,11 @@ tiny-keccak = { package = "tari-tiny-keccak", version = "2.0.2", features = [
"keccak",
] }
dirs-next = "1.0.2"
hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls", "dnssec-openssl"], optional = true }
hickory-client = { version = "=0.25.0-alpha.2", features = [
"dns-over-rustls",
"dnssec-openssl",
], optional = true }
hickory-proto = { version = "=0.25.0-alpha.2" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

why is this added in here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When I've locked hickory-client to 0.25.0-alpha.2 for some reason this hickory-proto still tried to use alpha 4 version of itself which broke the build so I added entry for this package with also locked version to 0.25.0-alpha.2

Copy link
Collaborator

Choose a reason for hiding this comment

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

you are adding a package thats not used by tari. You can see its complaining about it in machete

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is needed because hickory pushed a new version that doesn't compile, so you have to pin it like this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

please comment why its done there as well, I cant seem to add it via github review

anyhow = "1.0.53"

[dev-dependencies]
Expand Down Expand Up @@ -126,3 +130,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
'cfg(tari_target_network_nextnet)',
'cfg(tari_target_network_testnet)',
] }


[package.metadata.cargo-machete]
ignored = ["hickory-proto"]
11 changes: 9 additions & 2 deletions base_layer/p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ pgp = { version = "0.10", optional = true }
prost = "0.13.3"
rand = "0.8"
reqwest = { version = "0.11", optional = true, default-features = false }
rustls = { version = "0.23.13", default-features = false, features = ["logging", "std", "tls12"] }
rustls = { version = "0.23.13", default-features = false, features = [
"logging",
"std",
"tls12",
] }
semver = { version = "1.0.1", optional = true }
serde = "1.0.90"
thiserror = "1.0.26"
Expand All @@ -37,8 +41,9 @@ tokio-stream = { version = "0.1.9", default-features = false, features = [
"time",
] }
tower = "0.4.11"
hickory-client = { version = "0.25.0-alpha.2", features = ["dns-over-rustls"] }
hickory-client = { version = "=0.25.0-alpha.2", features = ["dns-over-rustls"] }
hickory-resolver = "0.25.0-alpha.2"
hickory-proto = { version = "=0.25.0-alpha.2" }
webpki-roots = "0.26.6"

[dev-dependencies]
Expand All @@ -58,3 +63,5 @@ tari_common = { path = "../../common", features = [
test-mocks = []
auto-update = ["reqwest/default", "pgp", "semver"]

[package.metadata.cargo-machete]
ignored = ["hickory-proto"]
Loading