From 6f3a8e33e23171ed8707d29015233d5ce0412520 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Thu, 4 Jan 2024 13:01:50 +0000
Subject: [PATCH] Sync workflow with wasmtime-rb

---
 .github/workflows/build-gems.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-gems.yml b/.github/workflows/build-gems.yml
index 2754c36fb7..5993ea8d26 100644
--- a/.github/workflows/build-gems.yml
+++ b/.github/workflows/build-gems.yml
@@ -33,19 +33,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: ruby/setup-ruby@v1
+      - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
         with:
           ruby-version: "3.2"
-          bundler-cache: false
+          bundler-cache: true
+          cargo-cache: true
+          cargo-vendor: true
+          cache-version: v2-${{ matrix.ruby-platform }}
 
-      - uses: oxidize-rb/actions/cross-gem@v1
-        id: cross-gem
+      - 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
         with:
-          platform: ${{ matrix.platform }}
-          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ',') }}
-          tag: "0.9.85"
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cross-gem
-          path: ${{ steps.cross-gem.outputs.gem-path }}
+          version: ${{ steps.vars.outputs.rb-sys-version }}
+          platform: ${{ matrix.ruby-platform }}
+          ruby-versions: ${{ join(fromJSON(needs.ci-data.outputs.result).stable-ruby-versions, ', ') }}