From 0eba85a47e4b7f0408bdc81514b8c939dee5e864 Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Mon, 24 Nov 2025 09:45:57 +0100
Subject: [PATCH] ci: fix/improve GHA builds

- windows2019 -> windows 2022
- macos-12 -> macos-latest
- add RTEMS 5.1/686 qemu build
- fix job names to properly name artifacts
---
 .github/workflows/ci-build.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index b98dcdc..891a2f5 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -13,8 +13,8 @@ env:
 
 jobs:
   build:
-    name: ${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.cross }}
-    runs-on: ${{ matrix.os}}
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
@@ -24,31 +24,43 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # Job names also name artifacts, character limitations apply
         include:
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
+            name: "Ub-24 default"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: static
+            name: "Ub-24 static"
 
-          - os: windows-2019
-            cmp: vs2019
+          - os: windows-2022
+            cmp: vs2022
             configuration: static
+            name: "Win-22 MSC-22 static"
 
           - os: ubuntu-latest
             cmp: gcc
             configuration: default
             cross: "RTEMS-pc386-qemu@4.10"
             test: NO
+            name: "Ub-24 gcc + RT-4.10"
 
-          - os: macos-12
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc686-qemu@5"
+            name: "Ub-24 gcc + RT-5.1 pc686"
+
+          - os: macos-latest
             cmp: clang
             configuration: default
+            name: "MacOS clang"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true