From 8e9bf0191774c8ea4d78bdba6b80e5db2eb0b775 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@ladybird.org>
Date: Tue, 27 May 2025 10:07:12 +0200
Subject: [PATCH] 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`.
---
 .github/workflows/ci.yml             | 10 +++++-----
 .github/workflows/js-artifacts.yml   |  6 +++---
 .github/workflows/js-benchmarks.yml  |  6 +++---
 .github/workflows/lagom-template.yml |  4 ++--
 .github/workflows/nightly-lagom.yml  | 14 +++++++-------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d778d26d05f..b429f13d967 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os_name: ['Linux']
-        os: [ubuntu-24.04]
+        runner: [ubuntu-24.04]
         arch: ['x86_64']
         build_preset: ['Sanitizer_CI']
         toolchain: ['GNU']
@@ -23,21 +23,21 @@ jobs:
 
         include:
           - os_name: 'Linux'
-            os: ubuntu-24.04
+            runner: ubuntu-24.04
             arch: 'x86_64'
             build_preset: 'Sanitizer_CI'
             toolchain: 'Clang'
             clang_plugins: true
 
           - os_name: 'macOS'
-            os: macos-15
+            runner: macos-15
             arch: 'arm64'
             build_preset: 'Sanitizer_CI'
             toolchain: 'Clang'
             clang_plugins: false
 
           - os_name: 'Linux'
-            os: ubuntu-24.04
+            runner: ubuntu-24.04
             arch: 'x86_64'
             build_preset: 'Fuzzers_CI'
             toolchain: 'Clang'
@@ -47,7 +47,7 @@ jobs:
     with:
       toolchain: ${{ matrix.toolchain }}
       os_name: ${{ matrix.os_name }}
-      os: ${{ matrix.os }}
+      runner: ${{ matrix.runner }}
       arch: ${{ matrix.arch }}
       build_preset: ${{ matrix.build_preset }}
       clang_plugins: ${{ matrix.clang_plugins }}
diff --git a/.github/workflows/js-artifacts.yml b/.github/workflows/js-artifacts.yml
index 56561bbb410..7739dd2c61e 100644
--- a/.github/workflows/js-artifacts.yml
+++ b/.github/workflows/js-artifacts.yml
@@ -11,19 +11,19 @@ env:
 
 jobs:
   build-and-package:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}
     if: github.repository == 'LadybirdBrowser/ladybird'
     strategy:
       fail-fast: false
       matrix:
         os_name: ['Linux']
-        os: ['ubuntu-24.04']
+        runner: ['ubuntu-24.04']
         arch: ['x86_64']
         package_type: ['Linux-x86_64']
 
         include:
           - os_name: 'macOS'
-            os: 'macos-15'
+            runner: 'macos-15'
             arch: 'arm64'
             package_type: 'macOS-universal2'
 
diff --git a/.github/workflows/js-benchmarks.yml b/.github/workflows/js-benchmarks.yml
index d32efe4e884..39e088acdf2 100644
--- a/.github/workflows/js-benchmarks.yml
+++ b/.github/workflows/js-benchmarks.yml
@@ -8,19 +8,19 @@ on:
 
 jobs:
   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' }}
     strategy:
       fail-fast: false
       matrix:
         os_name: ['Linux']
-        os: ['ubuntu-24.04-internal']
+        runner: ['ubuntu-24.04-internal']
         arch: ['x86_64']
         package_type: ['Linux-x86_64']
 
         include:
           - os_name: 'macOS'
-            os: 'macos-15'
+            runner: 'macos-15'
             arch: 'arm64'
             package_type: 'macOS-universal2'
 
diff --git a/.github/workflows/lagom-template.yml b/.github/workflows/lagom-template.yml
index 8d042bcb1f9..17696b27e8a 100644
--- a/.github/workflows/lagom-template.yml
+++ b/.github/workflows/lagom-template.yml
@@ -9,7 +9,7 @@ on:
       os_name:
         required: true
         type: string
-      os:
+      runner:
         required: true
         type: string
       arch:
@@ -38,7 +38,7 @@ env:
 
 jobs:
   CI:
-    runs-on: ${{ inputs.os }}
+    runs-on: ${{ inputs.runner }}
 
     steps:
       # Pull requests can trail behind `master` and can cause breakage if merging before running the CI checks on an updated branch.
diff --git a/.github/workflows/nightly-lagom.yml b/.github/workflows/nightly-lagom.yml
index 254a5bb8835..aa278cd395f 100644
--- a/.github/workflows/nightly-lagom.yml
+++ b/.github/workflows/nightly-lagom.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os_name: ['Linux']
-        os: [ubuntu-24.04-arm]
+        runner: [ubuntu-24.04-arm]
         arch: ['arm64']
         build_preset: ['Sanitizer_CI']
         toolchain: ['Clang']
@@ -26,35 +26,35 @@ jobs:
 
         include:
           - os_name: 'Linux'
-            os: ubuntu-24.04
+            runner: ubuntu-24.04
             arch: 'x86_64'
             build_preset: 'Distribution_CI'
             toolchain: 'GNU'
             clang_plugins: false
 
           - os_name: 'macOS'
-            os: macos-15
+            runner: macos-15
             arch: 'arm64'
             build_preset: 'Distribution_CI'
             toolchain: 'Clang'
             clang_plugins: false
 
           - os_name: 'Linux'
-            os: ubuntu-24.04-arm
+            runner: ubuntu-24.04-arm
             arch: 'arm64'
             build_preset: 'Distribution_CI'
             toolchain: 'Clang'
             clang_plugins: false
 
           - os_name: 'Linux'
-            os: ubuntu-24.04
+            runner: ubuntu-24.04
             arch: 'x86_64'
             build_preset: 'Sanitizer_CI'
             toolchain: 'Swift'
             clang_plugins: false
 
           - os_name: 'macOS'
-            os: macos-15
+            runner: macos-15
             arch: 'arm64'
             build_preset: 'Sanitizer_CI'
             toolchain: 'Swift'
@@ -64,7 +64,7 @@ jobs:
     with:
       toolchain: ${{ matrix.toolchain }}
       os_name: ${{ matrix.os_name }}
-      os: ${{ matrix.os }}
+      runner: ${{ matrix.runner }}
       arch: ${{ matrix.arch }}
       build_preset: ${{ matrix.build_preset }}
       clang_plugins: ${{ matrix.clang_plugins }}