Skip to content

Commit 60fa8ec

Browse files
committed
nmake check is working now with Windows platform
1 parent a1500ee commit 60fa8ec

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/windows.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ jobs:
2828
- vc: 2015
2929
vs: 2019
3030
vcvars: '10.0.14393.0 -vcvars_ver=14.0' # The oldest Windows 10 SDK w/ VC++ 2015 toolset (v140)
31+
test_task: check
3132
- vs: 2019
33+
test_task: check
3234
- vs: 2022
35+
test_task: check
3336
- vs: 2022
3437
test_task: test-bundled-gems
3538
fail-fast: false
@@ -46,7 +49,7 @@ jobs:
4649
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4750
)}}
4851
49-
name: VisualStudio ${{ matrix.vc || matrix.vs }} ${{ matrix.test_task || '' }}
52+
name: VisualStudio ${{ matrix.vc || matrix.vs }} (${{ matrix.test_task }})
5053

5154
env:
5255
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
@@ -174,14 +177,6 @@ jobs:
174177
- run: nmake test
175178
timeout-minutes: 5
176179

177-
- run: nmake test-spec
178-
timeout-minutes: 10
179-
if: ${{ matrix.test_task != 'test-bundled-gems' }}
180-
181-
- run: nmake test-bundled-gems
182-
timeout-minutes: 30
183-
if: ${{ matrix.test_task == 'test-bundled-gems' }}
184-
185180
- name: Set up Launchable
186181
uses: ./.github/actions/launchable/setup
187182
with:
@@ -195,13 +190,12 @@ jobs:
195190
continue-on-error: true
196191
if: ${{ matrix.test_task != 'test-bundled-gems' }}
197192

198-
- run: nmake test-all
193+
- run: nmake ${{ matrix.test_task || 'check' }}
199194
env:
200195
RUBY_TESTOPTS: >-
201196
-j${{ env.TEST_JOBS || 4 }}
202197
--job-status=normal
203-
timeout-minutes: 60
204-
if: ${{ matrix.test_task != 'test-bundled-gems' }}
198+
timeout-minutes: 70
205199

206200
- uses: ./.github/actions/slack
207201
with:

0 commit comments

Comments
 (0)