Skip to content

Commit 17af4da

Browse files
zeuxzeux
authored
Merge pull request #830 from zeux/js-bump
Update WASI SDK to 25
2 parents 9e51d27 + d70265d commit 17af4da

18 files changed

+46
-46
lines changed

‎.github/workflows/build.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,16 @@ jobs:
109109
- uses: actions/checkout@v4
110110
- uses: actions/setup-node@v4
111111
with:
112-
node-version: '16'
112+
node-version: '18'
113113
- name: install wasi
114114
run: |
115-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sdk-$VERSION.0-linux.tar.gz | tar xz
116-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/libclang_rt.builtins-wasm32-wasi-$VERSION.0.tar.gz | tar xz -C wasi-sdk-$VERSION.0
117-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sysroot-$VERSION.0.tar.gz | tar xz -C wasi-sdk-$VERSION.0/share
118-
mv wasi-sdk-$VERSION.0 wasi-sdk
115+
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sdk-$VERSION.0-x86_64-linux.deb > wasi-sdk.deb
116+
sudo dpkg -i wasi-sdk.deb
119117
env:
120-
VERSION: 22
118+
VERSION: 25
121119
- name: build
122120
run: |
123-
make -j2 -B WASI_SDK=wasi-sdk gltf/library.wasm js
121+
make -j2 -B gltf/library.wasm js
124122
git status
125123
- name: test
126124
run: |

‎.github/workflows/release.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,16 @@ jobs:
4242
- uses: actions/checkout@v4
4343
- uses: actions/setup-node@v4
4444
with:
45-
node-version: '16'
45+
node-version: '18'
4646
- name: install wasi
4747
run: |
48-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sdk-$VERSION.0-linux.tar.gz | tar xz
49-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/libclang_rt.builtins-wasm32-wasi-$VERSION.0.tar.gz | tar xz -C wasi-sdk-$VERSION.0
50-
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sysroot-$VERSION.0.tar.gz | tar xz -C wasi-sdk-$VERSION.0/share
51-
mv wasi-sdk-$VERSION.0 wasi-sdk
48+
curl -sL https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$VERSION/wasi-sdk-$VERSION.0-x86_64-linux.deb > wasi-sdk.deb
49+
sudo dpkg -i wasi-sdk.deb
5250
env:
53-
VERSION: 22
51+
VERSION: 25
5452
- name: build
5553
run: |
56-
make -j2 -B WASI_SDK=wasi-sdk gltf/library.wasm js
54+
make -j2 -B gltf/library.wasm js
5755
git status
5856
- name: npm pack
5957
run: |

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ifdef METIS
4040
$(DEMO): LDFLAGS+=-lmetis
4141
endif
4242

43+
WASI_SDK?=/opt/wasi-sdk
4344
WASMCC?=$(WASI_SDK)/bin/clang++
4445
WASIROOT?=$(WASI_SDK)/share/wasi-sysroot
4546

‎gltf/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
],
2222
"scripts": {
2323
"prepublishOnly": "node cli.js -v"
24+
},
25+
"engines": {
26+
"node": ">=18"
2427
}
2528
}

‎js/meshopt_clusterizer.js

+3-3
Large diffs are not rendered by default.

‎js/meshopt_clusterizer.module.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is part of meshoptimizer library and is distributed under the terms of MIT License.
2-
// Copyright (C) 2016-2024, by Arseny Kapoulkine ([email protected])
2+
// Copyright (C) 2016-2025, by Arseny Kapoulkine ([email protected])
33

44
export class Bounds {
55
centerX: number;

‎js/meshopt_clusterizer.module.js

+3-3
Large diffs are not rendered by default.

‎js/meshopt_decoder.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/meshopt_decoder.module.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is part of meshoptimizer library and is distributed under the terms of MIT License.
2-
// Copyright (C) 2016-2024, by Arseny Kapoulkine ([email protected])
2+
// Copyright (C) 2016-2025, by Arseny Kapoulkine ([email protected])
33
export const MeshoptDecoder: {
44
supported: boolean;
55
ready: Promise<void>;

‎js/meshopt_decoder.module.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/meshopt_decoder_reference.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is part of meshoptimizer library and is distributed under the terms of MIT License.
2-
// Copyright (C) 2016-2024, by Arseny Kapoulkine ([email protected])
2+
// Copyright (C) 2016-2025, by Arseny Kapoulkine ([email protected])
33

44
// This is the reference decoder implementation by Jasper St. Pierre.
55
// It follows the decoder interface and should be a drop-in replacement for the actual decoder from meshopt_decoder.js

‎js/meshopt_encoder.js

+3-3
Large diffs are not rendered by default.

‎js/meshopt_encoder.module.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is part of meshoptimizer library and is distributed under the terms of MIT License.
2-
// Copyright (C) 2016-2024, by Arseny Kapoulkine ([email protected])
2+
// Copyright (C) 2016-2025, by Arseny Kapoulkine ([email protected])
33
export type ExpMode = 'Separate' | 'SharedVector' | 'SharedComponent' | 'Clamped';
44

55
export const MeshoptEncoder: {

‎js/meshopt_encoder.module.js

+3-3
Large diffs are not rendered by default.

‎js/meshopt_simplifier.js

+3-3
Large diffs are not rendered by default.

‎js/meshopt_simplifier.module.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This file is part of meshoptimizer library and is distributed under the terms of MIT License.
2-
// Copyright (C) 2016-2024, by Arseny Kapoulkine ([email protected])
2+
// Copyright (C) 2016-2025, by Arseny Kapoulkine ([email protected])
33
export type Flags = 'LockBorder' | 'Sparse' | 'ErrorAbsolute' | 'Prune';
44

55
export const MeshoptSimplifier: {

‎js/meshopt_simplifier.module.js

+3-3
Large diffs are not rendered by default.

‎tools/wasmstubs.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#error This file contains libc stubs for WASI SDK and should only be used in non-Emscripten WebAssembly builds
33
#endif
44

5+
#include <assert.h>
56
#include <stddef.h>
67
#include <stdint.h>
7-
#include <assert.h>
88

99
extern unsigned char __heap_base;
1010
static intptr_t sbrkp = intptr_t(&__heap_base);

0 commit comments

Comments
 (0)