Skip to content

Commit 38d8bbb

Browse files
committed
chore: resolve merge conflicts with main (v0.96)
- Update dependency versions to 0.96 era, keep default-features=false - Drop iroh-blobs git dep, use released v0.98 - Use IntoAddressLookup API (renamed from IntoDiscovery in 0.96) - Keep main's docs-rs CI approach - Regenerate Cargo.lock
2 parents fb72830 + 00673a2 commit 38d8bbb

File tree

11 files changed

+1214
-983
lines changed

11 files changed

+1214
-983
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
RUST_BACKTRACE: 1
1717
RUSTFLAGS: -Dwarnings
1818
RUSTDOCFLAGS: -Dwarnings
19-
MSRV: "1.85"
19+
MSRV: "1.89"
2020
SCCACHE_CACHE_SIZE: "50G"
2121
IROH_FORCE_STAGING_RELAYS: "1"
2222

@@ -201,18 +201,16 @@ jobs:
201201
env:
202202
RUSTC_WRAPPER: "sccache"
203203
SCCACHE_GHA_ENABLED: "on"
204+
RUSTDOCFLAGS: -Dwarnings
204205
steps:
205-
- uses: actions/checkout@v4
206-
- uses: dtolnay/rust-toolchain@master
207-
with:
208-
toolchain: nightly-2025-10-09
206+
- uses: actions/checkout@v6
207+
- uses: dtolnay/rust-toolchain@nightly
208+
- uses: dtolnay/install@cargo-docs-rs
209209
- name: Install sccache
210210
uses: mozilla-actions/sccache-action@v0.0.9
211211

212-
- name: Docs
213-
run: cargo doc --workspace --all-features --no-deps --document-private-items
214-
env:
215-
RUSTDOCFLAGS: --cfg docsrs
212+
- name: iroh-docs docs
213+
run: cargo docs-rs
216214

217215
clippy_check:
218216
timeout-minutes: 30

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to iroh-docs will be documented in this file.
44

5+
## [0.96.0](https://github.com/n0-computer/iroh-docs/compare/v0.95.0..0.96.0) - 2026-01-29
6+
7+
### ⚙️ Miscellaneous Tasks
8+
9+
- Upgrade to `iroh` 0.96 - ([5133ca4](https://github.com/n0-computer/iroh-docs/commit/5133ca4360f3fd9e4891103d73cd6878200fde27))
10+
511
## [0.95.0](https://github.com/n0-computer/iroh-docs/compare/v0.94.0..0.95.0) - 2025-11-06
612

713
### ⚙️ Miscellaneous Tasks

0 commit comments

Comments
 (0)