Skip to content

Commit ec16316

Browse files
committed
Merge remote-tracking branch 'origin/main' into Frando/iroh-095
2 parents b4a41e0 + 45b4dc9 commit ec16316

37 files changed

+229
-245
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: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,3 +277,40 @@ jobs:
277277
- uses: actions/checkout@v5
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@v5
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/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/conventional-commit-checker-action@v2.0.0
17+
uses: agenthunt/conventional-commit-checker-action@v2.0.1
1818
with:
1919
pr-title-regex: "^(.+)(?:(([^)s]+)))?!?: (.+)"

.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@v5
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -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

Cargo.lock

Lines changed: 17 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)