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
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ jobs:
chmod +x ./build-exec
# wait for docker exec to be ready
timeout 10 bash -c 'until ./build-exec bundle config set --local without check; do sleep 1; done'
- run: ./build-exec rustup target add wasm32-wasip1 # For jco build
- run: ./build-exec ./bin/setup
- run: ./build-exec bundle exec rake compile
- name: Pre-release configuration
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

2 changes: 0 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ This document describes development setup and pointers for diving into this proj
$ git clone https://github.com/ruby/ruby.wasm --recursive
$ cd ruby.wasm
$ ./bin/setup
# Just for building vendor/jco (will be removed soon)
$ rustup target add wasm32-wasi
# Compile extension library
$ bundle exec rake compile
$ rake --tasks
Expand Down
7 changes: 0 additions & 7 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,4 @@ root="$(cd "$(dirname "$0")/.." && pwd)"

env BUNDLE_GEMFILE="$root/Gemfile" bundle install

# Build vendored jco if Rust toolchain is available and submodule is checked out
if command -v rustc && [ -f vendor/jco/package.json ]; then
npm -C vendor/jco install
npm -C vendor/jco run build
else
echo "Rust toolchain not found or jco submodule not checked out, skipping jco build"
fi
npm ci
10,215 changes: 1,298 additions & 8,917 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"packages/npm-packages/*"
],
"devDependencies": {
"@bytecodealliance/jco": "1.4.4",
"@playwright/test": "^1.46.1",
"@rollup/plugin-json": "^6.1.0",
"rollup": "^4.21.2",
"@bytecodealliance/jco": "./vendor/jco"
"rollup": "^4.21.2"
}
}
2 changes: 1 addition & 1 deletion packages/npm-packages/ruby-wasm-wasi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"build": "npm run build:rollup && npm run build:tsc && npm run build:static && ./tools/post-build.sh ./dist"
},
"devDependencies": {
"@bytecodealliance/jco": "../../../vendor/jco",
"@bytecodealliance/jco": "1.4.4",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@types/node": "20.12.2",
Expand Down
1 change: 0 additions & 1 deletion vendor/jco
Submodule jco deleted from dc3cf8