Skip to content

Commit 05148e6

Browse files
committed
In CI, separate OS name from runner version
In the matrix config, separate the notions of "os.name" (the nice name shown in the CI GUI) from "os.runs_on" (the value used for selecting the runner). They are still aligned after this change, but can now be manipulated independently.
1 parent ea032fe commit 05148e6

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -303,16 +303,19 @@ jobs:
303303
uses: ./.github/workflows/reusable-qa.yml
304304

305305
test:
306-
name: ${{ matrix.os }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
307-
runs-on: ${{ matrix.os }}-latest
306+
name: ${{ matrix.os.name }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
307+
runs-on: ${{ matrix.os.runs_on }}
308308
timeout-minutes: 15
309309
strategy:
310310
fail-fast: false
311311
matrix:
312312
os:
313-
- Ubuntu
314-
- Windows
315-
- macOS
313+
- name: Ubuntu
314+
runs_on: ubuntu-latest
315+
- name: Windows
316+
runs_on: windows-latest
317+
- name: macOS
318+
runs_on: macos-latest
316319
python-version: >-
317320
${{
318321
fromJSON(
@@ -420,26 +423,29 @@ jobs:
420423
flags: >-
421424
CI-GHA,
422425
OS-${{ runner.os }},
423-
VM-${{ matrix.os }},
426+
VM-${{ matrix.os.name }},
424427
Py-${{ steps.python-install.outputs.python-version }},
425428
Pip-${{ matrix.pip-version }}
426429
name: >-
427430
OS-${{ runner.os }},
428-
VM-${{ matrix.os }},
431+
VM-${{ matrix.os.name }},
429432
Py-${{ steps.python-install.outputs.python-version }},
430433
Pip-${{ matrix.pip-version }}
431434
432435
pypy:
433-
name: ${{ matrix.os }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
434-
runs-on: ${{ matrix.os }}-latest
436+
name: ${{ matrix.os.name }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
437+
runs-on: ${{ matrix.os.runs_on }}
435438
timeout-minutes: 9
436439
strategy:
437440
fail-fast: false
438441
matrix:
439442
os:
440-
- Ubuntu
441-
- MacOS
442-
- Windows
443+
- name: Ubuntu
444+
runs_on: ubuntu-latest
445+
- name: MacOS
446+
runs_on: macos-latest
447+
- name: Windows
448+
runs_on: windows-latest
443449
python-version:
444450
- pypy-3.10
445451
pip-version:

0 commit comments

Comments
 (0)