CI: Rename os input to runner

This more clearly describes what the value is being used for, and avoids
some confusion between `os` and `os_name` in `lagom-template.yml`.
This commit is contained in:
Jelle Raaijmakers 2025-05-27 10:07:12 +02:00 committed by Jelle Raaijmakers
commit 8e9bf01917
Notes: github-actions[bot] 2025-05-27 10:12:11 +00:00
5 changed files with 20 additions and 20 deletions

View file

@ -15,7 +15,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: [ubuntu-24.04] runner: [ubuntu-24.04]
arch: ['x86_64'] arch: ['x86_64']
build_preset: ['Sanitizer_CI'] build_preset: ['Sanitizer_CI']
toolchain: ['GNU'] toolchain: ['GNU']
@ -23,21 +23,21 @@ jobs:
include: include:
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 runner: ubuntu-24.04
arch: 'x86_64' arch: 'x86_64'
build_preset: 'Sanitizer_CI' build_preset: 'Sanitizer_CI'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: true clang_plugins: true
- os_name: 'macOS' - os_name: 'macOS'
os: macos-15 runner: macos-15
arch: 'arm64' arch: 'arm64'
build_preset: 'Sanitizer_CI' build_preset: 'Sanitizer_CI'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 runner: ubuntu-24.04
arch: 'x86_64' arch: 'x86_64'
build_preset: 'Fuzzers_CI' build_preset: 'Fuzzers_CI'
toolchain: 'Clang' toolchain: 'Clang'
@ -47,7 +47,7 @@ jobs:
with: with:
toolchain: ${{ matrix.toolchain }} toolchain: ${{ matrix.toolchain }}
os_name: ${{ matrix.os_name }} os_name: ${{ matrix.os_name }}
os: ${{ matrix.os }} runner: ${{ matrix.runner }}
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
build_preset: ${{ matrix.build_preset }} build_preset: ${{ matrix.build_preset }}
clang_plugins: ${{ matrix.clang_plugins }} clang_plugins: ${{ matrix.clang_plugins }}

View file

@ -11,19 +11,19 @@ env:
jobs: jobs:
build-and-package: build-and-package:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.runner }}
if: github.repository == 'LadybirdBrowser/ladybird' if: github.repository == 'LadybirdBrowser/ladybird'
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: ['ubuntu-24.04'] runner: ['ubuntu-24.04']
arch: ['x86_64'] arch: ['x86_64']
package_type: ['Linux-x86_64'] package_type: ['Linux-x86_64']
include: include:
- os_name: 'macOS' - os_name: 'macOS'
os: 'macos-15' runner: 'macos-15'
arch: 'arm64' arch: 'arm64'
package_type: 'macOS-universal2' package_type: 'macOS-universal2'

View file

@ -8,19 +8,19 @@ on:
jobs: jobs:
js-benchmarks: js-benchmarks:
runs-on: ['js-benchmarks', 'self-hosted', '${{ matrix.os }}'] runs-on: ['js-benchmarks', 'self-hosted', '${{ matrix.runner }}']
if: ${{ github.repository == 'LadybirdBrowser/ladybird' && github.event.workflow_run.conclusion == 'success' }} if: ${{ github.repository == 'LadybirdBrowser/ladybird' && github.event.workflow_run.conclusion == 'success' }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: ['ubuntu-24.04-internal'] runner: ['ubuntu-24.04-internal']
arch: ['x86_64'] arch: ['x86_64']
package_type: ['Linux-x86_64'] package_type: ['Linux-x86_64']
include: include:
- os_name: 'macOS' - os_name: 'macOS'
os: 'macos-15' runner: 'macos-15'
arch: 'arm64' arch: 'arm64'
package_type: 'macOS-universal2' package_type: 'macOS-universal2'

View file

@ -9,7 +9,7 @@ on:
os_name: os_name:
required: true required: true
type: string type: string
os: runner:
required: true required: true
type: string type: string
arch: arch:
@ -38,7 +38,7 @@ env:
jobs: jobs:
CI: CI:
runs-on: ${{ inputs.os }} runs-on: ${{ inputs.runner }}
steps: steps:
# Pull requests can trail behind `master` and can cause breakage if merging before running the CI checks on an updated branch. # Pull requests can trail behind `master` and can cause breakage if merging before running the CI checks on an updated branch.

View file

@ -18,7 +18,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: [ubuntu-24.04-arm] runner: [ubuntu-24.04-arm]
arch: ['arm64'] arch: ['arm64']
build_preset: ['Sanitizer_CI'] build_preset: ['Sanitizer_CI']
toolchain: ['Clang'] toolchain: ['Clang']
@ -26,35 +26,35 @@ jobs:
include: include:
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 runner: ubuntu-24.04
arch: 'x86_64' arch: 'x86_64'
build_preset: 'Distribution_CI' build_preset: 'Distribution_CI'
toolchain: 'GNU' toolchain: 'GNU'
clang_plugins: false clang_plugins: false
- os_name: 'macOS' - os_name: 'macOS'
os: macos-15 runner: macos-15
arch: 'arm64' arch: 'arm64'
build_preset: 'Distribution_CI' build_preset: 'Distribution_CI'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04-arm runner: ubuntu-24.04-arm
arch: 'arm64' arch: 'arm64'
build_preset: 'Distribution_CI' build_preset: 'Distribution_CI'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-24.04 runner: ubuntu-24.04
arch: 'x86_64' arch: 'x86_64'
build_preset: 'Sanitizer_CI' build_preset: 'Sanitizer_CI'
toolchain: 'Swift' toolchain: 'Swift'
clang_plugins: false clang_plugins: false
- os_name: 'macOS' - os_name: 'macOS'
os: macos-15 runner: macos-15
arch: 'arm64' arch: 'arm64'
build_preset: 'Sanitizer_CI' build_preset: 'Sanitizer_CI'
toolchain: 'Swift' toolchain: 'Swift'
@ -64,7 +64,7 @@ jobs:
with: with:
toolchain: ${{ matrix.toolchain }} toolchain: ${{ matrix.toolchain }}
os_name: ${{ matrix.os_name }} os_name: ${{ matrix.os_name }}
os: ${{ matrix.os }} runner: ${{ matrix.runner }}
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
build_preset: ${{ matrix.build_preset }} build_preset: ${{ matrix.build_preset }}
clang_plugins: ${{ matrix.clang_plugins }} clang_plugins: ${{ matrix.clang_plugins }}