Skip to content

Commit 061ece7

Browse files
b5b5
committed
chore(deps): fixup deps
1 parent 78a69fe commit 061ece7

File tree

2 files changed

+125
-125
lines changed

2 files changed

+125
-125
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 122 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
pull_request:
5-
types: [ 'labeled', 'unlabeled', 'opened', 'synchronize', 'reopened' ]
5+
types: ["labeled", "unlabeled", "opened", "synchronize", "reopened"]
66
merge_group:
77
push:
88
branches:
@@ -24,7 +24,7 @@ jobs:
2424
tests:
2525
name: CI Test Suite
2626
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
27-
uses: './.github/workflows/tests.yaml'
27+
uses: "./.github/workflows/tests.yaml"
2828

2929
cross_build:
3030
name: Cross Build Only
@@ -35,8 +35,8 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
target:
38-
# cross tests are currently broken vor armv7 and aarch64
39-
# see https://github.com/cross-rs/cross/issues/1311
38+
# cross tests are currently broken vor armv7 and aarch64
39+
# see https://github.com/cross-rs/cross/issues/1311
4040
# - armv7-linux-androideabi
4141
# - aarch64-linux-android
4242
# Freebsd execution fails in cross
@@ -45,29 +45,29 @@ jobs:
4545
# Netbsd execution fails to link in cross
4646
# - x86_64-unknown-netbsd
4747
steps:
48-
- name: Checkout
49-
uses: actions/checkout@v4
50-
with:
51-
submodules: recursive
52-
53-
- name: Install rust stable
54-
uses: dtolnay/rust-toolchain@stable
55-
56-
- name: Cleanup Docker
57-
continue-on-error: true
58-
run: |
59-
docker kill $(docker ps -q)
60-
61-
# See https://github.com/cross-rs/cross/issues/1222
62-
- uses: taiki-e/install-action@cross
63-
64-
- name: build
65-
# cross tests are currently broken vor armv7 and aarch64
66-
# see https://github.com/cross-rs/cross/issues/1311. So on
67-
# those platforms we only build but do not run tests.
68-
run: cross build --all --target ${{ matrix.target }}
69-
env:
70-
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}
48+
- name: Checkout
49+
uses: actions/checkout@v4
50+
with:
51+
submodules: recursive
52+
53+
- name: Install rust stable
54+
uses: dtolnay/rust-toolchain@stable
55+
56+
- name: Cleanup Docker
57+
continue-on-error: true
58+
run: |
59+
docker kill $(docker ps -q)
60+
61+
# See https://github.com/cross-rs/cross/issues/1222
62+
- uses: taiki-e/install-action@cross
63+
64+
- name: build
65+
# cross tests are currently broken vor armv7 and aarch64
66+
# see https://github.com/cross-rs/cross/issues/1311. So on
67+
# those platforms we only build but do not run tests.
68+
run: cross build --all --target ${{ matrix.target }}
69+
env:
70+
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}
7171

7272
android_build:
7373
name: Android Build Only
@@ -82,38 +82,38 @@ jobs:
8282
- aarch64-linux-android
8383
- armv7-linux-androideabi
8484
steps:
85-
- name: Checkout
86-
uses: actions/checkout@v4
87-
88-
- name: Set up Rust
89-
uses: dtolnay/rust-toolchain@stable
90-
with:
91-
target: ${{ matrix.target }}
92-
- name: Install rustup target
93-
run: rustup target add ${{ matrix.target }}
94-
95-
- name: Setup Java
96-
uses: actions/setup-java@v4
97-
with:
98-
distribution: 'temurin'
99-
java-version: '17'
100-
101-
- name: Setup Android SDK
102-
uses: android-actions/setup-android@v3
103-
104-
- name: Setup Android NDK
105-
uses: arqu/setup-ndk@main
106-
id: setup-ndk
107-
with:
108-
ndk-version: r23
109-
add-to-path: true
110-
111-
- name: Build
112-
env:
113-
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
114-
run: |
115-
cargo install --version 3.5.4 cargo-ndk
116-
cargo ndk --target ${{ matrix.target }} build
85+
- name: Checkout
86+
uses: actions/checkout@v4
87+
88+
- name: Set up Rust
89+
uses: dtolnay/rust-toolchain@stable
90+
with:
91+
target: ${{ matrix.target }}
92+
- name: Install rustup target
93+
run: rustup target add ${{ matrix.target }}
94+
95+
- name: Setup Java
96+
uses: actions/setup-java@v4
97+
with:
98+
distribution: "temurin"
99+
java-version: "17"
100+
101+
- name: Setup Android SDK
102+
uses: android-actions/setup-android@v3
103+
104+
- name: Setup Android NDK
105+
uses: arqu/setup-ndk@main
106+
id: setup-ndk
107+
with:
108+
ndk-version: r23
109+
add-to-path: true
110+
111+
- name: Build
112+
env:
113+
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
114+
run: |
115+
cargo install --version 3.5.4 cargo-ndk
116+
cargo ndk --target ${{ matrix.target }} build
117117
118118
cross_test:
119119
name: Cross Test
@@ -126,26 +126,26 @@ jobs:
126126
target:
127127
- i686-unknown-linux-gnu
128128
steps:
129-
- name: Checkout
130-
uses: actions/checkout@v4
131-
with:
132-
submodules: recursive
129+
- name: Checkout
130+
uses: actions/checkout@v4
131+
with:
132+
submodules: recursive
133133

134-
- name: Install rust stable
135-
uses: dtolnay/rust-toolchain@stable
134+
- name: Install rust stable
135+
uses: dtolnay/rust-toolchain@stable
136136

137-
- name: Cleanup Docker
138-
continue-on-error: true
139-
run: |
140-
docker kill $(docker ps -q)
137+
- name: Cleanup Docker
138+
continue-on-error: true
139+
run: |
140+
docker kill $(docker ps -q)
141141
142-
# See https://github.com/cross-rs/cross/issues/1222
143-
- uses: taiki-e/install-action@cross
142+
# See https://github.com/cross-rs/cross/issues/1222
143+
- uses: taiki-e/install-action@cross
144144

145-
- name: test
146-
run: cross test --all --target ${{ matrix.target }} -- --test-threads=12
147-
env:
148-
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
145+
- name: test
146+
run: cross test --all --target ${{ matrix.target }} -- --test-threads=12
147+
env:
148+
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
149149

150150
check_semver:
151151
runs-on: ubuntu-latest
@@ -186,13 +186,13 @@ jobs:
186186
RUSTC_WRAPPER: "sccache"
187187
SCCACHE_GHA_ENABLED: "on"
188188
steps:
189-
- uses: actions/checkout@v4
190-
- uses: dtolnay/rust-toolchain@stable
191-
with:
192-
components: rustfmt
193-
- uses: mozilla-actions/sccache-action@v0.0.9
194-
- uses: taiki-e/install-action@cargo-make
195-
- run: cargo make format-check
189+
- uses: actions/checkout@v4
190+
- uses: dtolnay/rust-toolchain@stable
191+
with:
192+
components: rustfmt
193+
- uses: mozilla-actions/sccache-action@v0.0.9
194+
- uses: taiki-e/install-action@cargo-make
195+
- run: cargo make format-check
196196

197197
check_docs:
198198
timeout-minutes: 30
@@ -202,17 +202,17 @@ jobs:
202202
RUSTC_WRAPPER: "sccache"
203203
SCCACHE_GHA_ENABLED: "on"
204204
steps:
205-
- uses: actions/checkout@v4
206-
- uses: dtolnay/rust-toolchain@master
207-
with:
208-
toolchain: nightly-2025-10-09
209-
- name: Install sccache
210-
uses: mozilla-actions/sccache-action@v0.0.9
211-
212-
- name: Docs
213-
run: cargo doc --workspace --all-features --no-deps --document-private-items
214-
env:
215-
RUSTDOCFLAGS: --cfg docsrs
205+
- uses: actions/checkout@v4
206+
- uses: dtolnay/rust-toolchain@master
207+
with:
208+
toolchain: nightly-2025-10-09
209+
- name: Install sccache
210+
uses: mozilla-actions/sccache-action@v0.0.9
211+
212+
- name: Docs
213+
run: cargo doc --workspace --all-features --no-deps --document-private-items
214+
env:
215+
RUSTDOCFLAGS: --cfg docsrs
216216

217217
clippy_check:
218218
timeout-minutes: 30
@@ -221,23 +221,23 @@ jobs:
221221
RUSTC_WRAPPER: "sccache"
222222
SCCACHE_GHA_ENABLED: "on"
223223
steps:
224-
- uses: actions/checkout@v4
225-
- uses: dtolnay/rust-toolchain@stable
226-
with:
227-
components: clippy
228-
- name: Install sccache
229-
uses: mozilla-actions/sccache-action@v0.0.9
224+
- uses: actions/checkout@v4
225+
- uses: dtolnay/rust-toolchain@stable
226+
with:
227+
components: clippy
228+
- name: Install sccache
229+
uses: mozilla-actions/sccache-action@v0.0.9
230230

231-
# TODO: We have a bunch of platform-dependent code so should
232-
# probably run this job on the full platform matrix
233-
- name: clippy check (all features)
234-
run: cargo clippy --workspace --all-features --all-targets --bins --tests --benches
231+
# TODO: We have a bunch of platform-dependent code so should
232+
# probably run this job on the full platform matrix
233+
- name: clippy check (all features)
234+
run: cargo clippy --workspace --all-features --all-targets --bins --tests --benches
235235

236-
- name: clippy check (no features)
237-
run: cargo clippy --workspace --no-default-features --lib --bins --tests
236+
- name: clippy check (no features)
237+
run: cargo clippy --workspace --no-default-features --lib --bins --tests
238238

239-
- name: clippy check (default features)
240-
run: cargo clippy --workspace --all-targets
239+
- name: clippy check (default features)
240+
run: cargo clippy --workspace --all-targets
241241

242242
msrv:
243243
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
@@ -248,17 +248,17 @@ jobs:
248248
RUSTC_WRAPPER: "sccache"
249249
SCCACHE_GHA_ENABLED: "on"
250250
steps:
251-
- uses: actions/checkout@v4
252-
- uses: dtolnay/rust-toolchain@master
253-
with:
254-
toolchain: ${{ env.MSRV }}
255-
- name: Install sccache
256-
uses: mozilla-actions/sccache-action@v0.0.9
257-
258-
- name: Check MSRV all features
259-
continue-on-error: true
260-
run: |
261-
cargo +$MSRV check --workspace --all-targets
251+
- uses: actions/checkout@v4
252+
- uses: dtolnay/rust-toolchain@master
253+
with:
254+
toolchain: ${{ env.MSRV }}
255+
- name: Install sccache
256+
uses: mozilla-actions/sccache-action@v0.0.9
257+
258+
- name: Check MSRV all features
259+
continue-on-error: true
260+
run: |
261+
cargo +$MSRV check --workspace --all-targets
262262
263263
cargo_deny:
264264
timeout-minutes: 30
@@ -276,9 +276,9 @@ jobs:
276276
timeout-minutes: 30
277277
runs-on: ubuntu-latest
278278
steps:
279-
- uses: actions/checkout@v4
280-
- run: pip install --user codespell[toml]
281-
- run: codespell --ignore-words-list=ans,atmost,crate,inout,ratatui,ser,stayin,swarmin,worl --skip=CHANGELOG.md
279+
- uses: actions/checkout@v4
280+
- run: pip install --user codespell[toml]
281+
- run: codespell --ignore-words-list=ans,atmost,crate,inout,ratatui,ser,stayin,swarmin,worl --skip=CHANGELOG.md
282282

283283
wasm_build:
284284
name: Build & test wasm32
@@ -315,4 +315,4 @@ jobs:
315315
# some non-Wasm-compatible code made it into the final code.
316316
- name: Ensure no 'import "env"' in wasm
317317
run: |
318-
! wasm-tools print --skeleton target/wasm32-unknown-unknown/debug/iroh_docs.wasm | grep 'import "env"'
318+
! wasm-tools print --skeleton target/wasm32-unknown-unknown/debug/iroh_docs.wasm | grep 'import "env"'

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ futures-util = { version = "0.3.25" }
3333
hex = "0.4"
3434
iroh = { version = "0.94", default-features = false }
3535
iroh-tickets = { version = "0.1"}
36-
iroh-blobs = { git = "https://github.com/n0-computer/iroh-blobs", branch = "Frando/wasm-nopatch", default-features = false }
36+
iroh-blobs = { version = "0.97" default-features = false }
3737
iroh-gossip = { version = "0.94", features = ["net"], default-features = false }
3838
iroh-metrics = { version = "0.36", default-features = false }
39-
irpc = { git = "https://github.com/n0-computer/irpc", branch = "main", default-features = false }
40-
n0-future = { version = "0.3", features = ["serde"], git = "https://github.com/n0-computer/n0-future", branch = "Frando/time-serde" }
39+
irpc = { version = "0.11", default-features = false }
40+
n0-future = { version = "0.3", features = ["serde"], git = "https://github.com/n0-computer/n0-future", branch = "main" }
4141
num_enum = "0.7"
4242
postcard = { version = "1", default-features = false, features = [
4343
"alloc",

0 commit comments

Comments
 (0)