Skip to content

Commit 6b97374

Browse files
committed
Run CAPI check separately
1 parent 35b31ce commit 6b97374

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

.github/actions/capiext/action.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ inputs:
44
builddir:
55
required: false
66
default: '.'
7+
make:
8+
required: false
9+
default: 'make -s'
710

811
outputs:
912
key:
@@ -35,10 +38,13 @@ runs:
3538
path: ${{ inputs.builddir }}/spec/ruby/optional/capi/ext/
3639
key: ${{ steps.config.outputs.key }}
3740

38-
- name: Force rubyspec CAPI extension binaries up to date
41+
- name: Run test-spec with previous CAPI extension binaries
3942
shell: bash
4043
run: |
41-
touch ${{ inputs.builddir }}/spec/ruby/optional/capi/ext/*.$DLEXT
44+
touch spec/ruby/optional/capi/ext/*.$DLEXT
45+
[ ! -f spec/ruby/optional/capi/ext/\*.$DLEXT ]
46+
${{ inputs.make }} SPECOPTS=optional/capi test-spec
4247
env:
4348
DLEXT: ${{ steps.config.outputs.DLEXT }}
49+
working-directory: ${{ inputs.builddir }}
4450
if: ${{ steps.cache.outputs.cache-hit }}

.github/workflows/macos.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
os: macos-14
4646
- test_task: check
4747
os: macos-15
48-
capi_check: true
48+
capi_check: capi
4949
- test_task: check
5050
os: macos-13
5151
fail-fast: false
@@ -164,11 +164,6 @@ jobs:
164164
uses: ./.github/actions/capiext
165165
with:
166166
builddir: build
167-
if: ${{ matrix.capi_check }}
168-
169-
- name: Check with previous CAPI extensions
170-
run: |
171-
make -s test-spec
172167
env:
173168
RUBY_TESTOPTS: '-v --tty=no'
174169
if: ${{ matrix.capi_check }}

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- test_task: test-bundled-gems
4040
- test_task: check
4141
os: ubuntu-24.04
42-
capi_check: true
42+
capi_check: capi
4343
# ubuntu-24.04-arm jobs don't start on ruby/ruby as of 2025-09-04
4444
#- test_task: check
4545
# os: ubuntu-24.04-arm
@@ -157,11 +157,7 @@ jobs:
157157
uses: ./.github/actions/capiext
158158
with:
159159
builddir: build
160-
if: ${{ matrix.capi_check }}
161-
162-
- name: Check with previous CAPI extensions
163-
run: |
164-
$SETARCH make -s test-spec
160+
make: '$SETARCH make'
165161
env:
166162
RUBY_TESTOPTS: '-v --tty=no'
167163
if: ${{ matrix.capi_check }}

0 commit comments

Comments
 (0)