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

Author: kateinoigakukun

.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

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 | \

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 | \

package-lock.json

@@ -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"