Merge pull request #479 from ruby/dependabot/submodules/vendor/jco-2f…

…1e4d8
ruby · Jun 29, 2024 · 73d3d5a · 73d3d5a
2 parents f682558 + c87a95c
commit 73d3d5a
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -134,7 +134,7 @@ 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-wasi # For jco build
+      - 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

diff --git a/builders/wasm32-unknown-emscripten/Dockerfile b/builders/wasm32-unknown-emscripten/Dockerfile
@@ -23,7 +23,7 @@ ENV PATH=/usr/bin:$PATH
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.76.0
+    RUST_VERSION=1.79.0
 
 RUN set -eux pipefail; \
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \

diff --git a/builders/wasm32-unknown-wasi/Dockerfile b/builders/wasm32-unknown-wasi/Dockerfile
@@ -27,7 +27,7 @@ RUN set -eux pipefail; \
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.76.0
+    RUST_VERSION=1.79.0
 
 RUN set -eux pipefail; \
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \

diff --git a/package-lock.json b/package-lock.json
diff --git a/rakelib/packaging.rake b/rakelib/packaging.rake
@@ -25,6 +25,10 @@ def npm_pkg_build_command(pkg)
 end
 
 def npm_pkg_rubies_cache_key(pkg)
+  # FIXME: Now CrossRubyExtProduct depends on just built baseruby, and exts can be
+  # built after restoring the tarball cache. So it can fail to find baseruby when the
+  # cache hit. We need to orchestrate the build dependency graph properly.
+  return nil if pkg[:name] == "ruby-head-wasm-wasi"
   build_command = npm_pkg_build_command(pkg)
   return nil unless build_command
   require "open3"

diff --git a/vendor/jco b/vendor/jco
+4 −4		.github/workflows/main.yml
+124 −146		Cargo.lock
+14 −15		Cargo.toml
+1 −1		crates/js-component-bindgen/Cargo.toml
+14 −6		crates/js-component-bindgen/src/core.rs
+3 −6		crates/js-component-bindgen/src/lib.rs
+87 −52		crates/js-component-bindgen/src/transpile_bindgen.rs
+10 −5		crates/js-component-bindgen/src/ts_bindgen.rs
+0 −2		docs/src/example.md
+ −		lib/wasi_snapshot_preview1.command.wasm
+ −		lib/wasi_snapshot_preview1.reactor.wasm
+111 −101		package-lock.json
+4 −4		package.json
+7 −0		packages/preview2-shim/lib/nodejs/filesystem.js
+1 −1		packages/preview2-shim/package.json
+1 −1		src/jco.js
+1 −1		submodules/WASI-Virt
+1 −1		submodules/wasm-tools
+1 −1		submodules/wasmtime
+2 −2		test/api.js
+1 −1		test/cli.js
+2 −1		test/eslintrc.cjs
+2 −2		xtask/src/build/jco.rs
+6 −2		xtask/src/build/workspace.rs
+9 −4		xtask/src/generate/tests.rs