From e4dc3b0143c0ac01d1051869b9ff8cb48eb14a3c Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Wed, 19 Nov 2025 13:11:09 -0500
Subject: [PATCH] Update CI configuration for .NET 10 and Fedora 43

- Add Fedora 43 to CI configuration
- Add UBI 10 to CI configuration
- Add .NET 10 to the CI matrix
---
 .github/workflows/ci.yml   | 23 +++++++++++++----------
 system-data-odbc/test.json |  3 ++-
 tools-in-path/test.json    |  2 ++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c278e1..009e835 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,24 +22,25 @@ jobs:
           - docker.io/library/alpine:edge
           - quay.io/centos/centos:stream9
           - quay.io/centos/centos:stream10
-          - registry.fedoraproject.org/fedora:41
           - registry.fedoraproject.org/fedora:42
+          - registry.fedoraproject.org/fedora:43
           - registry.fedoraproject.org/fedora:rawhide
           - registry.access.redhat.com/ubi8
           - registry.access.redhat.com/ubi9
+          - registry.access.redhat.com/ubi10
         dotnet_version:
           - "8.0"
           - "9.0"
-        include:
-          - container_image: registry.fedoraproject.org/fedora:42
-            dotnet_version: "10.0"
-          - container_image: registry.fedoraproject.org/fedora:rawhide
-            dotnet_version: "10.0"
+          - "10.0"
         exclude:
           - container_image: docker.io/library/alpine:latest
             dotnet_version: "9.0"
           - container_image: docker.io/library/alpine:edge
             dotnet_version: "9.0"
+          - container_image: docker.io/library/alpine:latest
+            dotnet_version: "10.0"
+          - container_image: docker.io/library/alpine:edge
+            dotnet_version: "10.0"
 
 
     container:
@@ -58,7 +59,7 @@ jobs:
           set -euo pipefail
           cat /etc/os-release
           if grep fedora /etc/os-release; then
-            if [[ ${{ matrix.dotnet_version }} == 10.* ]]; then
+            if [[ ${{ matrix.dotnet_version }} == 11.* ]]; then
               dnf install 'dnf-command(copr)' -y
               if grep centos /etc/os-release; then
                 dnf copr enable @dotnet-sig/dotnet-preview centos-stream-10-x86_64 -y
@@ -111,13 +112,15 @@ jobs:
 
           trait_flags=()
 
-          if [[ ${{ matrix.container_image }} == *ubi8* ]] ; then
+          if [[ ${{ matrix.container_image }} == *ubi8 ]] ; then
               trait_flags+=( --trait ubi8-repos )
           fi
-
-          if [[ ${{ matrix.container_image }} == *ubi9* ]] ; then
+          if [[ ${{ matrix.container_image }} == *ubi9 ]] ; then
               trait_flags+=( --trait ubi9-repos )
           fi
+          if [[ ${{ matrix.container_image }} == *ubi10 ]] ; then
+              trait_flags+=( --trait ubi10-repos )
+          fi
 
           dotnet turkey/Turkey.dll -v --timeout 600 --trait github-ci "${trait_flags[@]}"
         shell: bash
diff --git a/system-data-odbc/test.json b/system-data-odbc/test.json
index 8a87cb2..6edd7f5 100644
--- a/system-data-odbc/test.json
+++ b/system-data-odbc/test.json
@@ -8,6 +8,7 @@
   "cleanup": true,
   "skipWhen": [
     "ubi8-repos", // UBI8 repos don't contain postgressql server
-    "ubi9-repos" // UBI9 repos don't contain postgressql server
+    "ubi9-repos", // UBI9 repos don't contain postgressql server
+    "ubi10-repos" // UBI10 repos don't contain postgressql server
   ]
 }
diff --git a/tools-in-path/test.json b/tools-in-path/test.json
index f498ca0..5678331 100644
--- a/tools-in-path/test.json
+++ b/tools-in-path/test.json
@@ -7,6 +7,8 @@
   "cleanup": true,
   "skipWhen": [
     "vmr-ci", // tools PATH not configured (tar.gz build)
+    "os=fedora.34", // Fedora packages stopped updating PATH with 44
+    "os=fedora.35"
   ],
   "ignoredRIDs": [
   ]