[PR #3284] [MERGED] Fix CI on release branch #3711

New issue

Closed

opened 2026-03-16 11:58:35 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:58:35 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/3284
Author: @divergentdave
Created: 9/27/2025
Status: ✅ Merged
Merged: 9/28/2025
Merged by: @djc

Base: release/0.25 ← Head: david/fix-ci-0.25

📝 Commits (10+)

1193ebf test-data: regenerate test certificates
cfbb86f Remove extra blank line after doc comment
03f315e Make all of RetrySendStream conditional on feature
ab23882 Ignore large enum variant lint
f74bce3 Ignore Clippy lint about string indexing
6f6a15f Remove unnecessary parentheses in types
4af5300 Remove unnecessary clone
9598a8e Ignore Clippy lints for large error types
78497d9 Ignore Clippy lint for unnecessary unwrap
b44c8c0 Replace match with if-let

📊 Changes

26 files changed (+331 additions, -342 deletions)

View changed files

📝 Cargo.lock (+12 -34)
📝 crates/client/src/client/client.rs (+1 -0)
📝 crates/client/src/client/dnssec_client.rs (+1 -1)
📝 crates/proto/src/dnssec/dnssec_dns_handle/mod.rs (+2 -0)
📝 crates/proto/src/rr/rdata/tlsa.rs (+0 -1)
📝 crates/proto/src/serialize/txt/zone.rs (+1 -0)
📝 crates/proto/src/xfer/dns_exchange.rs (+1 -0)
📝 crates/proto/src/xfer/retry_dns_handle.rs (+6 -0)
📝 crates/server/src/authority/catalog.rs (+2 -1)
📝 crates/server/src/store/in_memory/inner.rs (+2 -3)
📝 tests/integration-tests/tests/integration/client_future_tests.rs (+22 -22)
📝 tests/integration-tests/tests/integration/name_server_pool_tests.rs (+2 -1)
📝 tests/test-data/ca.der (+0 -0)
📝 tests/test-data/ca.key (+50 -50)
📝 tests/test-data/ca.pem (+25 -25)
📝 tests/test-data/ca.pubkey (+12 -12)
📝 tests/test-data/cert-key.pk8 (+50 -50)
📝 tests/test-data/cert.csr (+23 -23)
📝 tests/test-data/cert.key (+50 -50)
📝 tests/test-data/cert.p12 (+0 -0)

...and 6 more files

📄 Description

This cherry-picks or duplicates various fixes from the main branch onto the release/0.25 branch.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/3284 **Author:** [@divergentdave](https://github.com/divergentdave) **Created:** 9/27/2025 **Status:** ✅ Merged **Merged:** 9/28/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `release/0.25` ← **Head:** `david/fix-ci-0.25` --- ### 📝 Commits (10+) - [`1193ebf`](https://github.com/hickory-dns/hickory-dns/commit/1193ebf6102e63c70d3f9e2142a137c36efb3e71) test-data: regenerate test certificates - [`cfbb86f`](https://github.com/hickory-dns/hickory-dns/commit/cfbb86f851fd28bd4740930d7fa389183d645764) Remove extra blank line after doc comment - [`03f315e`](https://github.com/hickory-dns/hickory-dns/commit/03f315ef4eae0e29f5603db1d1dc881829b6f988) Make all of RetrySendStream conditional on feature - [`ab23882`](https://github.com/hickory-dns/hickory-dns/commit/ab23882efb6c8fccf113a66a83b758210fc191db) Ignore large enum variant lint - [`f74bce3`](https://github.com/hickory-dns/hickory-dns/commit/f74bce3b670c0af1518f2af7e09dd8e9e8da78b5) Ignore Clippy lint about string indexing - [`6f6a15f`](https://github.com/hickory-dns/hickory-dns/commit/6f6a15fdf15de1f46ca29dbec6c43ff5a76a165b) Remove unnecessary parentheses in types - [`4af5300`](https://github.com/hickory-dns/hickory-dns/commit/4af530081e93113b86bc223a2f4f34daf2ab9faf) Remove unnecessary clone - [`9598a8e`](https://github.com/hickory-dns/hickory-dns/commit/9598a8ed43e2cdfbf1e58fcf14530e6b946e1386) Ignore Clippy lints for large error types - [`78497d9`](https://github.com/hickory-dns/hickory-dns/commit/78497d9964611a788ee66a2f4f9f3fcaeab80ce7) Ignore Clippy lint for unnecessary unwrap - [`b44c8c0`](https://github.com/hickory-dns/hickory-dns/commit/b44c8c0aee0d21b7c05fb0a9441396d38c3c9f7a) Replace match with if-let ### 📊 Changes **26 files changed** (+331 additions, -342 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+12 -34) 📝 `crates/client/src/client/client.rs` (+1 -0) 📝 `crates/client/src/client/dnssec_client.rs` (+1 -1) 📝 `crates/proto/src/dnssec/dnssec_dns_handle/mod.rs` (+2 -0) 📝 `crates/proto/src/rr/rdata/tlsa.rs` (+0 -1) 📝 `crates/proto/src/serialize/txt/zone.rs` (+1 -0) 📝 `crates/proto/src/xfer/dns_exchange.rs` (+1 -0) 📝 `crates/proto/src/xfer/retry_dns_handle.rs` (+6 -0) 📝 `crates/server/src/authority/catalog.rs` (+2 -1) 📝 `crates/server/src/store/in_memory/inner.rs` (+2 -3) 📝 `tests/integration-tests/tests/integration/client_future_tests.rs` (+22 -22) 📝 `tests/integration-tests/tests/integration/name_server_pool_tests.rs` (+2 -1) 📝 `tests/test-data/ca.der` (+0 -0) 📝 `tests/test-data/ca.key` (+50 -50) 📝 `tests/test-data/ca.pem` (+25 -25) 📝 `tests/test-data/ca.pubkey` (+12 -12) 📝 `tests/test-data/cert-key.pk8` (+50 -50) 📝 `tests/test-data/cert.csr` (+23 -23) 📝 `tests/test-data/cert.key` (+50 -50) 📝 `tests/test-data/cert.p12` (+0 -0) _...and 6 more files_ </details> ### 📄 Description This cherry-picks or duplicates various fixes from the main branch onto the release/0.25 branch. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>