From d910cab2548586bf3c8a5206909ba2df82b743c0 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 31 Dec 2024 17:24:36 +0100
Subject: [PATCH] .github/ci: Use fixed names

This lets us update "runs-on" without creating a mismatch with the
required checks that are configured for the repo in the github ui.
---
 .github/workflows/ci.yml | 28 +++++++++++++++++++++-------
 .mergify.yml             |  8 ++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd61a3f12..971760d5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-14]
-    runs-on: ${{ matrix.os }}
+        include:
+          - scenario: on ubuntu
+            runs-on: ubuntu-24.04
+            os: linux
+          - scenario: on macos
+            runs-on: macos-14
+            os: darwin
+    name: tests ${{ matrix.scenario }}
+    runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
@@ -37,7 +44,7 @@ jobs:
     # Since ubuntu 22.30, unprivileged usernamespaces are no longer allowed to map to the root user:
     # https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
     - run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'linux'
     - run: scripts/build-checks
     - run: scripts/prepare-installer-for-github-actions
     - name: Upload installer tarball
@@ -51,8 +58,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-14]
-    runs-on: ${{ matrix.os }}
+        include:
+          - scenario: on ubuntu
+            runs-on: ubuntu-24.04
+            os: linux
+          - scenario: on macos
+            runs-on: macos-14
+            os: darwin
+    name: installer test ${{ matrix.scenario }}
+    runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v4
     - name: Download installer tarball
@@ -68,9 +82,9 @@ jobs:
         install_url: 'http://localhost:8126/install'
         install_options: "--tarball-url-prefix http://localhost:8126/"
     - run: sudo apt install fish zsh
-      if: matrix.os == 'ubuntu-24.04'
+      if: matrix.os == 'linux'
     - run: brew install fish
-      if: matrix.os == 'macos-14'
+      if: matrix.os == 'darwin'
     - run: exec bash -c "nix-instantiate -E 'builtins.currentTime' --eval"
     - run: exec sh -c "nix-instantiate -E 'builtins.currentTime' --eval"
     - run: exec zsh -c "nix-instantiate -E 'builtins.currentTime' --eval"
diff --git a/.mergify.yml b/.mergify.yml
index e432f8db7..f930e1b28 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -5,10 +5,10 @@ queue_rules:
       - check-success=installer
       - check-success=installer_test (macos-latest)
       - check-success=installer_test (ubuntu-latest)
-      - check-success=tests (macos-14)
-      - check-success=tests (ubuntu-24.04)
-      - check-success=installer_test (macos-14)
-      - check-success=installer_test (ubuntu-24.04)
+      - check-success=tests on macos
+      - check-success=tests on ubuntu
+      - check-success=installer_test on macos
+      - check-success=installer_test on ubuntu
       - check-success=vm_tests
     merge_method: rebase
     batch_size: 5