Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ jobs:
- host: ubuntu-latest
target: wasm32-wasip1-threads
setup: |
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-33/wasi-sdk-33.0-x86_64-linux.tar.gz
tar -xvf wasi-sdk-33.0-x86_64-linux.tar.gz
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-34/wasi-sdk-34.0-x86_64-linux.tar.gz
tar -xvf wasi-sdk-34.0-x86_64-linux.tar.gz
build: |
export WASI_SDK_PATH="$(pwd)/wasi-sdk-33.0-x86_64-linux"
export WASI_SDK_PATH="$(pwd)/wasi-sdk-34.0-x86_64-linux"
export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$WASI_SDK_PATH/share/wasi-sysroot"
export CMAKE_BUILD_PARALLEL_LEVEL=2
export TARGET_CXXFLAGS="--target=wasm32-wasi-threads --sysroot=$(pwd)/wasi-sdk-33.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp"
export TARGET_CXXFLAGS="--target=wasm32-wasip1-threads --sysroot=$(pwd)/wasi-sdk-34.0-x86_64-linux/share/wasi-sysroot -pthread -mllvm -wasm-enable-sjlj -lsetjmp"
export TARGET_CFLAGS="$TARGET_CXXFLAGS"
yarn workspace @napi-rs/image build --target wasm32-wasip1-threads

Expand Down Expand Up @@ -190,7 +190,8 @@ jobs:
.xwin
~/.napi-rs
target/
key: ${{ matrix.settings.target }}-cargo-cache
# Keep WASI native objects in sync with the SDK bundled by Rust 1.100.
key: ${{ matrix.settings.target }}-cargo-cache${{ matrix.settings.target == 'wasm32-wasip1-threads' && '-wasi-sdk-34' || '' }}
- name: Setup toolchain
run: ${{ matrix.settings.setup }}
if: ${{ matrix.settings.setup }}
Expand Down Expand Up @@ -273,7 +274,7 @@ jobs:
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: 'v4.4.5'
cmake-version: 'v4.5.0'
- name: Setup node
uses: actions/setup-node@v7
with:
Expand Down Expand Up @@ -597,6 +598,8 @@ jobs:
- name: Drop published @napi-rs/image-wasm32-wasi so the fresh local wasm is used
run: find . -type d -path '*@napi-rs/image-wasm32-wasi' -prune -print -exec rm -rf {} +
shell: bash
- name: Smoke test fresh WASI module initialization
run: timeout 60s node -e "require('./packages/binding/image.wasi.cjs'); console.log('WASI module initialized'); process.exit(0)"
- name: Run tests
run: yarn test -s
env:
Expand Down
2 changes: 1 addition & 1 deletion packages/binding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ napi-derive = { version = "3.0.0", default-features = false, features = ["
num-complex = "0.4"
num_cpus = "1"
once_cell = "1"
resvg = "0.49"
resvg = "0.50"
rexif = "0.7"
rgb = "0.8"
svgtypes = "0.16"
Expand Down
Loading