From 69a9684cd26944a4160a4c7a272b215097f2b3ca Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:49:38 -0500
Subject: [PATCH] chore(CI): surface on f41 (#47)

* chore(CI): surface on f41

* handle dnf5 for addrepo.

remove Asus 40

* handle dnf5 for surface

* correct flag

* correct flag
---
 .github/workflows/reusable-build.yml | 9 +++++++--
 fetch.sh                             | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 3996cc5..70ed3f2 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -41,6 +41,8 @@ jobs:
           - 40
           - 41
         exclude:
+          - fedora_version: 40
+            kernel_flavor: asus
           - fedora_version: 41
             kernel_flavor: fsync
           - fedora_version: 41
@@ -49,8 +51,6 @@ jobs:
             kernel_flavor: bazzite
           - fedora_version: 40
             kernel_flavor: coreos-testing
-          - fedora_version: 41
-            kernel_flavor: surface
 
     steps:
       - name: Checkout Push to Registry action
@@ -148,8 +148,13 @@ jobs:
                 build_tag=$(echo -E $latest | jq -r '.tag_name')
                 ;;
               "surface")
+                if [[ "${{ matrix.fedora_version }}" < 41 ]]; then
                 $dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
+                else
+                $dnf config-manager addrepo --from-repofile=https://pkg.surfacelinux.com/fedora/linux-surface.repo
+                fi
                 linux=$($dnf repoquery --repoid linux-surface --whatprovides kernel-surface | sort -V | tail -n1 | sed 's/.*://')
+
                 ;;
               "main")
                 base_image_name="base"
diff --git a/fetch.sh b/fetch.sh
index 0928491..3cb3f88 100755
--- a/fetch.sh
+++ b/fetch.sh
@@ -23,7 +23,11 @@ case "$kernel_flavor" in
         dnf copr enable -y sentry/kernel-ba
         ;;
     "surface")
-        dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
+       if [[ "$(rpm -E %fedora)" -lt 41 ]]; then
+                dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
+                else
+                dnf config-manager addrepo --from-repofile=https://pkg.surfacelinux.com/fedora/linux-surface.repo
+        fi
         ;;
     "coreos-stable")
         ;;