@@ -199,53 +199,37 @@ jobs:
199199 free-threading : ${{ matrix.free-threading }}
200200
201201 build_macos :
202- name : ' macOS'
202+ name : >-
203+ macOS
204+ ${{ fromJSON(matrix.free-threading) && '(free-threading)' || '' }}
203205 needs : check_source
204206 if : needs.check_source.outputs.run_tests == 'true'
205207 strategy :
206208 fail-fast : false
207209 matrix :
208210 # Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
211+ # macOS 13 only runs tests against the GIL-enabled CPython.
209212 # Cirrus used for upstream, macos-14 for forks.
210213 os :
211214 - ghcr.io/cirruslabs/macos-runner:sonoma
212215 - macos-14
213216 - macos-13
214217 is-fork : # only used for the exclusion trick
215218 - ${{ github.repository_owner != 'python' }}
219+ free-threading :
220+ - false
221+ - true
216222 exclude :
217223 - os : ghcr.io/cirruslabs/macos-runner:sonoma
218224 is-fork : true
219225 - os : macos-14
220226 is-fork : false
227+ - os : macos-13
228+ free-threading : true
221229 uses : ./.github/workflows/reusable-macos.yml
222230 with :
223231 config_hash : ${{ needs.check_source.outputs.config_hash }}
224- os : ${{ matrix.os }}
225-
226- build_macos_free_threading :
227- name : ' macOS (free-threading)'
228- needs : check_source
229- if : needs.check_source.outputs.run_tests == 'true'
230- strategy :
231- fail-fast : false
232- matrix :
233- # Cirrus and macos-14 are M1.
234- # Cirrus used for upstream, macos-14 for forks.
235- os :
236- - ghcr.io/cirruslabs/macos-runner:sonoma
237- - macos-14
238- is-fork : # only used for the exclusion trick
239- - ${{ github.repository_owner != 'python' }}
240- exclude :
241- - os : ghcr.io/cirruslabs/macos-runner:sonoma
242- is-fork : true
243- - os : macos-14
244- is-fork : false
245- uses : ./.github/workflows/reusable-macos.yml
246- with :
247- config_hash : ${{ needs.check_source.outputs.config_hash }}
248- free-threading : true
232+ free-threading : ${{ matrix.free-threading }}
249233 os : ${{ matrix.os }}
250234
251235 build_ubuntu :
@@ -583,7 +567,6 @@ jobs:
583567 - check-docs
584568 - check_generated_files
585569 - build_macos
586- - build_macos_free_threading
587570 - build_ubuntu
588571 - build_ubuntu_free_threading
589572 - build_ubuntu_ssltests
@@ -618,7 +601,6 @@ jobs:
618601 && '
619602 check_generated_files,
620603 build_macos,
621- build_macos_free_threading,
622604 build_ubuntu,
623605 build_ubuntu_free_threading,
624606 build_ubuntu_ssltests,
0 commit comments