From 5d1a16d845d4c0933d7226fd6ccfea351f04adc3 Mon Sep 17 00:00:00 2001
From: Jimmy Bourassa <jbourassa@gmail.com>
Date: Sun, 12 Jan 2025 19:07:50 -0500
Subject: [PATCH 1/2] Update cross-gem action

---
 .github/workflows/build-gems.yml | 25 +++++++++++--------------
 .github/workflows/release.yml    | 32 ++++++++++++++++----------------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build-gems.yml b/.github/workflows/build-gems.yml
index 9f7cf51d..1ee23bcc 100644
--- a/.github/workflows/build-gems.yml
+++ b/.github/workflows/build-gems.yml
@@ -40,28 +40,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.4"
-          bundler-cache: true
-          cargo-cache: true
-          cargo-vendor: true
-          cache-version: v2-${{ matrix.ruby-platform }}
-
-      - name: Set vars
-        id: vars
-        run: |
-          echo "rb-sys-version=$(bundle exec ruby -rrb_sys -e 'puts RbSys::VERSION')" >> $GITHUB_OUTPUT
 
-      - uses: oxidize-rb/cross-gem-action@main
+      - uses: oxidize-rb/actions/cross-gem@v1
+        id: cross-gem
         with:
-          version: ${{ steps.vars.outputs.rb-sys-version }}
           platform: ${{ matrix.ruby-platform }}
-          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ', ') }}
+          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ',') }}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cross-gem-${{ matrix.ruby-platform }}
+          path: ${{ steps.cross-gem.outputs.gem-path }}
+          if-no-files-found: error
 
       - name: Smoke gem install
         if: matrix.ruby-platform == 'x86_64-linux' # GitHub actions architecture
-        run: bundle exec rake pkg:${{ matrix.ruby-platform }}:test
+        run: bundle install && bundle exec rake pkg:${{ matrix.ruby-platform }}:test
 
   source:
     name: Build source gem
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b444c8bc..72f961d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,19 +40,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
-          bundler-cache: true
-          cargo-cache: true
-          cargo-vendor: true
-          cache-version: v1-${{ matrix.ruby-platform }}
+          ruby-version: "3.4"
 
-      - uses: oxidize-rb/cross-gem-action@main
+      - uses: oxidize-rb/actions/cross-gem@v1
+        id: cross-gem
         with:
-          version: latest
           platform: ${{ matrix.ruby-platform }}
-          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ', ') }}
+          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ',') }}
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cross-gem-${{ matrix.ruby-platform }}
+          path: pkg/*-${{ matrix.ruby-platform }}.gem
+          if-no-files-found: error
 
       - name: Smoke gem install
         if: matrix.ruby-platform == 'x86_64-linux' # GitHub actions architecture
@@ -71,18 +73,16 @@ jobs:
 
       - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
           cargo-cache: true
           cache-version: v1
 
-      # It seems that v4 is not compatible with how artifacts are uploaded by
-      # oxidize-rb/cross-gem-action. So this must stay as v3 until the issue
-      # below is fixed.
-      # See https://github.com/oxidize-rb/actions/issues/27, for more details.
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: cross-gem
+          pattern: cross-gem-*
+          merge-multiple: true
+          path: pkg/
 
       - name: Package source gem
         run: bundle exec rake pkg:ruby

From f10e46351f6844cda523a2da291db91d02bbb8e9 Mon Sep 17 00:00:00 2001
From: Jimmy Bourassa <jbourassa@gmail.com>
Date: Tue, 14 Jan 2025 06:33:43 -0500
Subject: [PATCH 2/2] Update rb-sys

---
 Cargo.lock       | 8 ++++----
 Gemfile.lock     | 4 ++--
 wasmtime.gemspec | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 235b889f..a5cfbcce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1371,18 +1371,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.107"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56aaf81d9efc195606456e91896297ee5ab2002381539f8ed1ba6b4f2e467f3b"
+checksum = "1e955384e1a4dc64b71d1e4b39ed0edbd77c7bde4a10dfd5ad208e1160fddfa7"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.107"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035b513baded6df2b90a8559efb1973c47ba42e16c21c5f0863dd2aa4dbd6abe"
+checksum = "c167c6571889b2550d6fcb315e8aa60bdb95e47e4b64793e3f65a30dc25afc85"
 dependencies = [
  "bindgen",
  "lazy_static",
diff --git a/Gemfile.lock b/Gemfile.lock
index 980927cd..fb222303 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     wasmtime (28.0.0)
-      rb_sys (~> 0.9.107)
+      rb_sys (~> 0.9.108)
 
 GEM
   remote: https://rubygems.org/
@@ -38,7 +38,7 @@ GEM
     rake (13.2.1)
     rake-compiler (1.2.9)
       rake
-    rb_sys (0.9.107)
+    rb_sys (0.9.108)
     regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
diff --git a/wasmtime.gemspec b/wasmtime.gemspec
index a5d1a231..7cd12912 100644
--- a/wasmtime.gemspec
+++ b/wasmtime.gemspec
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.rdoc_options += ["--exclude", "vendor"]
 
-  spec.add_dependency "rb_sys", "~> 0.9.107"
+  spec.add_dependency "rb_sys", "~> 0.9.108"
 end