Skip to content

Commit 411e877

Browse files
Setup @ruby/wasm-wasi for testing on ci
also remove build-package.sh and use `npm run build` instead
1 parent 0786e28 commit 411e877

File tree

9 files changed

+23
-54
lines changed

9 files changed

+23
-54
lines changed

Rakefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ NPM_PACKAGES = [
107107
build: "head-wasm32-unknown-emscripten-full",
108108
target: "wasm32-unknown-emscripten"
109109
},
110+
{
111+
name: "ruby-wasm-wasi",
112+
build: "head-wasm32-unknown-wasi-full-js-debug",
113+
target: "wasm32-unknown-wasi"
114+
},
110115
{
111116
name: "ruby-head-wasm-wasi",
112117
build: "head-wasm32-unknown-wasi-full-js-debug",

packages/npm-packages/ruby-3_2-wasm-wasi/build-package.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/npm-packages/ruby-3_2-wasm-wasi/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
"README.md"
1212
],
1313
"scripts": {
14-
"test": "RUBY_NPM_PACKAGE_ROOT=../ruby-3_2-wasm-wasi npm -C ../ruby-wasm-wasi test",
14+
"test": "RUBY_NPM_PACKAGE_ROOT=../ruby-3_2-wasm-wasi npm -C ../ruby-wasm-wasi run test:run",
1515
"build:deps": "cd ../ruby-wasm-wasi && npm run build",
16-
"build:static:wasm": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
16+
"build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
1717
"build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-3_2-wasm-wasi",
18-
"build:static": "npm run build:static:wasm && npm run build:static:compat",
18+
"build:static": "npm run build:static:files && npm run build:static:compat",
19+
"build:wasm": "../ruby-wasm-wasi/tools/pack-ruby-wasm.sh ../../../rubies/3_2-wasm32-unknown-wasi-full-js-debug ./dist",
1920
"build:rollup": "rollup -c rollup.config.mjs",
20-
"build": "npm run build:deps && npm run build:static && npm run build:rollup"
21+
"build": "npm run build:deps && npm run build:static && npm run build:wasm && npm run build:rollup"
2122
},
2223
"repository": "https://github.com/ruby/ruby.wasm",
2324
"homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-3_2-wasm-wasi",

packages/npm-packages/ruby-head-wasm-wasi/build-package.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/npm-packages/ruby-head-wasm-wasi/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
"README.md"
1212
],
1313
"scripts": {
14-
"test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi test",
14+
"test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi run test:run",
1515
"build:deps": "cd ../ruby-wasm-wasi && npm run build",
16-
"build:static:wasm": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
16+
"build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
1717
"build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-head-wasm-wasi",
18-
"build:static": "npm run build:static:wasm && npm run build:static:compat",
18+
"build:static": "npm run build:static:files && npm run build:static:compat",
19+
"build:wasm": "../ruby-wasm-wasi/tools/pack-ruby-wasm.sh ../../../rubies/head-wasm32-unknown-wasi-full-js-debug ./dist",
1920
"build:rollup": "rollup -c rollup.config.mjs",
20-
"build": "npm run build:deps && npm run build:static && npm run build:rollup"
21+
"build": "npm run build:deps && npm run build:static && npm run build:wasm && npm run build:rollup"
2122
},
2223
"repository": "https://github.com/ruby/ruby.wasm",
2324
"homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-head-wasm-wasi",

packages/npm-packages/ruby-wasm-wasi/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
],
2424
"license": "MIT",
2525
"scripts": {
26-
"test": "npm run test:unit && npm run test:jest",
26+
"test:run": "npm run test:unit && npm run test:jest",
27+
"test:head": "RUBY_ROOT=../../../rubies/head-wasm32-unknown-wasi-full-js-debug npm run test:run",
28+
"test": "npm run test:head",
2729
"test:jest": "NODE_OPTIONS=\"--experimental-wasi-unstable-preview1\" jest --coverage",
2830
"test:unit": "./tools/run-test-unit.mjs",
2931
"format": "prettier --write .",

packages/npm-packages/ruby-wasm-wasi/test/package.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const initRubyVM = async (rubyModule: WebAssembly.Module, args: string[]) => {
3030
describe("Packaging validation", () => {
3131
jest.setTimeout(20 /*sec*/ * 1000);
3232
if (!process.env.RUBY_NPM_PACKAGE_ROOT) {
33+
test.skip('skip', () => {})
3334
return;
3435
}
3536

packages/npm-packages/ruby-wasm-wasi/tools/run-test-unit.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ const test = async (instantiate) => {
160160
161161
const main = async () => {
162162
await test(instantiateNodeWasi);
163-
await test(instantiateWasmerWasi);
163+
if (!process.env.RUBY_ROOT) {
164+
await test(instantiateWasmerWasi);
165+
}
164166
};
165167
166168
main();

tasks/packaging.rake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ namespace :npm do
1313
namespace pkg[:name] do
1414
desc "Build npm package #{pkg[:name]}"
1515
task "build" => ["build:#{pkg[:build]}"] do
16-
sh tools,
17-
"#{pkg_dir}/build-package.sh #{base_dir}/rubies/#{pkg[:build]}"
16+
sh tools, "npm run build", chdir: pkg_dir
1817
end
1918

2019
desc "Check npm package #{pkg[:name]}"

0 commit comments

Comments
 (0)