Skip to content

Commit d97631c

Browse files
committed
🧪💅 Melt (non-)free-threading Win jobs a matrix
Previously, these were defined through two separate matrices but there is no technical reason to keep them like that.
1 parent 597392d commit d97631c

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

‎.github/workflows/build.yml

+7-18
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,9 @@ jobs:
179179
run: make check-c-globals
180180

181181
build_windows:
182-
name: 'Windows'
182+
name: >-
183+
Windows
184+
${{ fromJSON(matrix.free-threading && '(free-threading)' || '' }}
183185
needs: check_source
184186
if: fromJSON(needs.check_source.outputs.run_tests)
185187
strategy:
@@ -188,24 +190,13 @@ jobs:
188190
- Win32
189191
- x64
190192
- arm64
193+
free-threading:
194+
- false
195+
- true
191196
uses: ./.github/workflows/reusable-windows.yml
192197
with:
193198
arch: ${{ matrix.arch }}
194-
195-
build_windows_free_threading:
196-
name: 'Windows (free-threading)'
197-
needs: check_source
198-
if: fromJSON(needs.check_source.outputs.run_tests)
199-
strategy:
200-
matrix:
201-
arch:
202-
- Win32
203-
- x64
204-
- arm64
205-
uses: ./.github/workflows/reusable-windows.yml
206-
with:
207-
arch: ${{ matrix.arch }}
208-
free-threading: true
199+
free-threading: ${{ matrix.free-threading }}
209200

210201
build_macos:
211202
name: 'macOS'
@@ -571,7 +562,6 @@ jobs:
571562
- build_ubuntu_ssltests
572563
- build_wasi
573564
- build_windows
574-
- build_windows_free_threading
575565
- test_hypothesis
576566
- build_asan
577567
- build_tsan
@@ -607,7 +597,6 @@ jobs:
607597
build_ubuntu_ssltests,
608598
build_wasi,
609599
build_windows,
610-
build_windows_free_threading,
611600
build_asan,
612601
build_tsan,
613602
build_tsan_free_threading,

0 commit comments

Comments
 (0)