Skip to content

Commit 3e31eb5

Browse files
committed
Merge branch 'main' into lightweight-watcher
2 parents ddd45d9 + e1456f9 commit 3e31eb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+6413
-3864
lines changed

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[target.wasm32-unknown-unknown]
2+
runner = "wasm-bindgen-test-runner"
3+
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

.github/workflows/ci.yaml

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# - x86_64-unknown-netbsd
4747
steps:
4848
- name: Checkout
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v6
5050
with:
5151
submodules: recursive
5252

@@ -83,7 +83,7 @@ jobs:
8383
- armv7-linux-androideabi
8484
steps:
8585
- name: Checkout
86-
uses: actions/checkout@v4
86+
uses: actions/checkout@v6
8787

8888
- name: Set up Rust
8989
uses: dtolnay/rust-toolchain@stable
@@ -93,7 +93,7 @@ jobs:
9393
run: rustup target add ${{ matrix.target }}
9494

9595
- name: Setup Java
96-
uses: actions/setup-java@v4
96+
uses: actions/setup-java@v5
9797
with:
9898
distribution: 'temurin'
9999
java-version: '17'
@@ -127,7 +127,7 @@ jobs:
127127
- i686-unknown-linux-gnu
128128
steps:
129129
- name: Checkout
130-
uses: actions/checkout@v4
130+
uses: actions/checkout@v6
131131
with:
132132
submodules: recursive
133133

@@ -143,7 +143,7 @@ jobs:
143143
- uses: taiki-e/install-action@cross
144144

145145
- name: test
146-
run: cross test --all --target ${{ matrix.target }} -- --test-threads=4
146+
run: cross test --all --target ${{ matrix.target }} -- --test-threads=1
147147
env:
148148
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG' }}
149149

@@ -153,7 +153,7 @@ jobs:
153153
RUSTC_WRAPPER: "sccache"
154154
SCCACHE_GHA_ENABLED: "on"
155155
steps:
156-
- uses: actions/checkout@v4
156+
- uses: actions/checkout@v6
157157
with:
158158
fetch-depth: 0
159159
- name: Install sccache
@@ -185,7 +185,7 @@ jobs:
185185
RUSTC_WRAPPER: "sccache"
186186
SCCACHE_GHA_ENABLED: "on"
187187
steps:
188-
- uses: actions/checkout@v4
188+
- uses: actions/checkout@v6
189189
- uses: dtolnay/rust-toolchain@stable
190190
with:
191191
components: rustfmt
@@ -201,10 +201,10 @@ jobs:
201201
RUSTC_WRAPPER: "sccache"
202202
SCCACHE_GHA_ENABLED: "on"
203203
steps:
204-
- uses: actions/checkout@v4
204+
- uses: actions/checkout@v6
205205
- uses: dtolnay/rust-toolchain@master
206206
with:
207-
toolchain: nightly-2024-11-30
207+
toolchain: nightly-2025-09-28
208208
- name: Install sccache
209209
uses: mozilla-actions/[email protected]
210210

@@ -220,7 +220,7 @@ jobs:
220220
RUSTC_WRAPPER: "sccache"
221221
SCCACHE_GHA_ENABLED: "on"
222222
steps:
223-
- uses: actions/checkout@v4
223+
- uses: actions/checkout@v6
224224
- uses: dtolnay/rust-toolchain@stable
225225
with:
226226
components: clippy
@@ -247,7 +247,7 @@ jobs:
247247
RUSTC_WRAPPER: "sccache"
248248
SCCACHE_GHA_ENABLED: "on"
249249
steps:
250-
- uses: actions/checkout@v4
250+
- uses: actions/checkout@v6
251251
- uses: dtolnay/rust-toolchain@master
252252
with:
253253
toolchain: ${{ env.MSRV }}
@@ -263,7 +263,7 @@ jobs:
263263
name: cargo deny
264264
runs-on: ubuntu-latest
265265
steps:
266-
- uses: actions/checkout@v4
266+
- uses: actions/checkout@v6
267267
- uses: EmbarkStudios/cargo-deny-action@v2
268268
with:
269269
arguments: --workspace --all-features
@@ -274,6 +274,43 @@ jobs:
274274
timeout-minutes: 30
275275
runs-on: ubuntu-latest
276276
steps:
277-
- uses: actions/checkout@v4
277+
- uses: actions/checkout@v6
278278
- run: pip install --user codespell[toml]
279279
- run: codespell --ignore-words-list=ans,atmost,crate,inout,ratatui,ser,stayin,swarmin,worl --skip=CHANGELOG.md
280+
281+
wasm_build:
282+
name: Build & test wasm32
283+
runs-on: ubuntu-latest
284+
env:
285+
RUSTFLAGS: '--cfg getrandom_backend="wasm_js"'
286+
steps:
287+
- name: Checkout sources
288+
uses: actions/checkout@v6
289+
290+
- name: Install Node.js
291+
uses: actions/setup-node@v6
292+
with:
293+
node-version: 20
294+
295+
- name: Install stable toolchain
296+
uses: dtolnay/rust-toolchain@stable
297+
298+
- name: Add wasm target
299+
run: rustup target add wasm32-unknown-unknown
300+
301+
- name: Install wasm-tools
302+
uses: bytecodealliance/actions/wasm-tools/setup@v1
303+
304+
- name: Install wasm-pack
305+
uses: taiki-e/install-action@v2
306+
with:
307+
tool: wasm-bindgen,wasm-pack
308+
309+
- name: wasm32 build
310+
run: cargo build --target wasm32-unknown-unknown --no-default-features
311+
312+
# If the Wasm file contains any 'import "env"' declarations, then
313+
# some non-Wasm-compatible code made it into the final code.
314+
- name: Ensure no 'import "env"' in wasm
315+
run: |
316+
! wasm-tools print --skeleton target/wasm32-unknown-unknown/debug/iroh_blobs.wasm | grep 'import "env"'

.github/workflows/cleanup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727
with:
2828
ref: generated-docs-preview
2929
- name: Clean docs branch

.github/workflows/commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
steps:
1515
- name: check-for-cc
1616
id: check-for-cc
17-
uses: agenthunt/[email protected].0
17+
uses: agenthunt/[email protected].1
1818
with:
1919
pr-title-regex: "^(.+)(?:(([^)s]+)))?!?: (.+)"

.github/workflows/docs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
PREVIEW_PATH: pr/${{ github.event.pull_request.number || inputs.pr_number }}/docs
3030

3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
35-
toolchain: nightly-2024-11-30
35+
toolchain: nightly-2025-09-28
3636
- name: Install sccache
3737
uses: mozilla-actions/[email protected]
3838

@@ -50,7 +50,7 @@ jobs:
5050
publish_branch: generated-docs-preview
5151

5252
- name: Find Docs Comment
53-
uses: peter-evans/find-comment@v3
53+
uses: peter-evans/find-comment@v4
5454
id: fc
5555
with:
5656
issue-number: ${{ github.event.pull_request.number || inputs.pr_number }}
@@ -62,7 +62,7 @@ jobs:
6262
run: echo "TIMESTAMP=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
6363

6464
- name: Create or Update Docs Comment
65-
uses: peter-evans/create-or-update-comment@v4
65+
uses: peter-evans/create-or-update-comment@v5
6666
with:
6767
issue-number: ${{ github.event.pull_request.number || inputs.pr_number }}
6868
comment-id: ${{ steps.fc.outputs.comment-id }}

.github/workflows/flaky.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
echo TESTS_RESULT=$result
6060
echo "TESTS_RESULT=$result" >>"$GITHUB_ENV"
6161
- name: download nextest reports
62-
uses: actions/download-artifact@v4
62+
uses: actions/download-artifact@v6
6363
with:
6464
pattern: libtest_run_${{ github.run_number }}-${{ github.run_attempt }}-*
6565
merge-multiple: true

.github/workflows/tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
RUSTC_WRAPPER: "sccache"
5555
steps:
5656
- name: Checkout
57-
uses: actions/checkout@v4
57+
uses: actions/checkout@v6
5858
with:
5959
ref: ${{ inputs.git-ref }}
6060

@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: upload results
124124
if: ${{ failure() && inputs.flaky }}
125-
uses: actions/upload-artifact@v4
125+
uses: actions/upload-artifact@v5
126126
with:
127127
name: libtest_run_${{ github.run_number }}-${{ github.run_attempt }}-${{ matrix.name }}_${{ matrix.features }}_${{ matrix.rust }}.json
128128
path: output
@@ -161,7 +161,7 @@ jobs:
161161
RUSTC_WRAPPER: "sccache"
162162
steps:
163163
- name: Checkout
164-
uses: actions/checkout@v4
164+
uses: actions/checkout@v6
165165
with:
166166
ref: ${{ inputs.git-ref }}
167167

@@ -221,7 +221,7 @@ jobs:
221221

222222
- name: upload results
223223
if: ${{ failure() && inputs.flaky }}
224-
uses: actions/upload-artifact@v4
224+
uses: actions/upload-artifact@v5
225225
with:
226226
name: libtest_run_${{ github.run_number }}-${{ github.run_attempt }}-${{ matrix.name }}_${{ matrix.features }}_${{ matrix.rust }}.json
227227
path: output

0 commit comments

Comments
 (0)