Sync workflow with wasmtime-rb

ruby · Jan 4, 2024 · 0240644 · 0240644
1 parent 7ebcf6f
commit 0240644
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/.github/workflows/build-gems.yml b/.github/workflows/build-gems.yml
@@ -23,29 +23,30 @@ jobs:
             exclude: [head]
 
   cross-gem:
-    name: Compile native gem for ${{ matrix.platform }}
+    name: Compile native gem for ${{ matrix.ruby-platform }}
     runs-on: ubuntu-latest
     needs: ci-data
     strategy:
       fail-fast: false
       matrix:
-        platform: ${{ fromJSON(needs.ci-data.outputs.result).supported-ruby-platforms }}
+        ruby-platform: ${{ fromJSON(needs.ci-data.outputs.result).supported-ruby-platforms }}
     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, ', ') }}