Skip to content

Commit 9921816

Browse files
sirosenwebknjaz
andcommitted
Update runs-on matrix declaration style
- Use a flat array, rather than objects in an array - Name the key `runner-vm` to match other projects - Allow the verbatim `runs-on` identifier to appear in job names - Set a requisite actionlint ignore for a runner it does not recognize Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <578543+webknjaz@users.noreply.github.com>
1 parent ececfb7 commit 9921816

File tree

2 files changed

+21
-24
lines changed

2 files changed

+21
-24
lines changed

.github/workflows/ci.yml

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

305305
test:
306-
name: ${{ matrix.os.name }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
307-
runs-on: ${{ matrix.os.runs_on }}
306+
name: ${{ matrix.runner-vm }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
307+
runs-on: ${{ matrix.runner-vm }}
308308
timeout-minutes: 15
309309
strategy:
310310
fail-fast: false
311311
matrix:
312-
os:
313-
- name: Ubuntu
314-
runs_on: ubuntu-latest
315-
- name: Windows
316-
runs_on: windows-latest
317-
- name: macOS
318-
runs_on: macos-26
319-
- name: "macOS (Intel)"
320-
runs_on: macos-26-intel
312+
runner-vm:
313+
- ubuntu-latest
314+
- windows-latest
315+
- macos-26
316+
- macos-26-intel
321317
python-version: >-
322318
${{
323319
fromJSON(
@@ -425,31 +421,27 @@ jobs:
425421
flags: >-
426422
CI-GHA,
427423
OS-${{ runner.os }},
428-
VM-${{ matrix.os.name }},
424+
VM-${{ matrix.runner-vm }},
429425
Py-${{ steps.python-install.outputs.python-version }},
430426
Pip-${{ matrix.pip-version }}
431427
name: >-
432428
OS-${{ runner.os }},
433-
VM-${{ matrix.os.name }},
429+
VM-${{ matrix.runner-vm }},
434430
Py-${{ steps.python-install.outputs.python-version }},
435431
Pip-${{ matrix.pip-version }}
436432
437433
pypy:
438-
name: ${{ matrix.os.name }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
439-
runs-on: ${{ matrix.os.runs_on }}
434+
name: ${{ matrix.runner-vm }} / ${{ matrix.python-version }} / ${{ matrix.pip-version }}
435+
runs-on: ${{ matrix.runner-vm }}
440436
timeout-minutes: 9
441437
strategy:
442438
fail-fast: false
443439
matrix:
444-
os:
445-
- name: Ubuntu
446-
runs_on: ubuntu-latest
447-
- name: MacOS
448-
runs_on: macos-26
449-
- name: "MacOS (Intel)"
450-
runs_on: macos-26-intel
451-
- name: Windows
452-
runs_on: windows-latest
440+
runner-vm:
441+
- ubuntu-latest
442+
- macos-26
443+
- macos-26-intel
444+
- windows-latest
453445
python-version:
454446
- pypy-3.10
455447
pip-version:

.pre-commit-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ repos:
116116
# and checks these with shellcheck.
117117
# The integration only works if shellcheck is installed.
118118
- "github.com/wasilibs/go-shellcheck/cmd/shellcheck@v0.11.1"
119+
args:
120+
# NOTE: actionlint does not recognize this label, even though it is valid
121+
# NOTE: potentially revise in the future
122+
- '-ignore'
123+
- 'label "macos-26-intel" is unknown'
119124

120125
- repo: https://github.com/jackdewinter/pymarkdown.git
121126
rev: v0.9.36

0 commit comments

Comments
 (0)