Skip to content

Commit 1953280

Browse files
Install jco via npm instead of git submodule
1 parent 0b031b2 commit 1953280

File tree

8 files changed

+1301
-8934
lines changed

8 files changed

+1301
-8934
lines changed

Diff for: .github/workflows/build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ jobs:
134134
chmod +x ./build-exec
135135
# wait for docker exec to be ready
136136
timeout 10 bash -c 'until ./build-exec bundle config set --local without check; do sleep 1; done'
137-
- run: ./build-exec rustup target add wasm32-wasip1 # For jco build
138137
- run: ./build-exec ./bin/setup
139138
- run: ./build-exec bundle exec rake compile
140139
- name: Pre-release configuration

Diff for: .gitmodules

-3
This file was deleted.

Diff for: CONTRIBUTING.md

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ This document describes development setup and pointers for diving into this proj
99
$ git clone https://github.com/ruby/ruby.wasm --recursive
1010
$ cd ruby.wasm
1111
$ ./bin/setup
12-
# Just for building vendor/jco (will be removed soon)
13-
$ rustup target add wasm32-wasi
1412
# Compile extension library
1513
$ bundle exec rake compile
1614
$ rake --tasks

Diff for: bin/setup

-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ root="$(cd "$(dirname "$0")/.." && pwd)"
77

88
env BUNDLE_GEMFILE="$root/Gemfile" bundle install
99

10-
# Build vendored jco if Rust toolchain is available and submodule is checked out
11-
if command -v rustc && [ -f vendor/jco/package.json ]; then
12-
npm -C vendor/jco install
13-
npm -C vendor/jco run build
14-
else
15-
echo "Rust toolchain not found or jco submodule not checked out, skipping jco build"
16-
fi
1710
npm ci

Diff for: package-lock.json

+1,298-8,917
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"packages/npm-packages/*"
66
],
77
"devDependencies": {
8+
"@bytecodealliance/jco": "1.4.4",
89
"@playwright/test": "^1.46.1",
910
"@rollup/plugin-json": "^6.1.0",
10-
"rollup": "^4.21.2",
11-
"@bytecodealliance/jco": "./vendor/jco"
11+
"rollup": "^4.21.2"
1212
}
1313
}

Diff for: packages/npm-packages/ruby-wasm-wasi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"build": "npm run build:rollup && npm run build:tsc && npm run build:static && ./tools/post-build.sh ./dist"
5555
},
5656
"devDependencies": {
57-
"@bytecodealliance/jco": "../../../vendor/jco",
57+
"@bytecodealliance/jco": "1.4.4",
5858
"@rollup/plugin-node-resolve": "^15.2.3",
5959
"@rollup/plugin-typescript": "^11.1.6",
6060
"@types/node": "20.12.2",

Diff for: vendor/jco

-1
This file was deleted.

0 commit comments

Comments
 (0)