Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit 69a9684

Browse files
authored
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
1 parent 1e906bb commit 69a9684

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/reusable-build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ jobs:
4141
- 40
4242
- 41
4343
exclude:
44+
- fedora_version: 40
45+
kernel_flavor: asus
4446
- fedora_version: 41
4547
kernel_flavor: fsync
4648
- fedora_version: 41
@@ -49,8 +51,6 @@ jobs:
4951
kernel_flavor: bazzite
5052
- fedora_version: 40
5153
kernel_flavor: coreos-testing
52-
- fedora_version: 41
53-
kernel_flavor: surface
5454

5555
steps:
5656
- name: Checkout Push to Registry action
@@ -148,8 +148,13 @@ jobs:
148148
build_tag=$(echo -E $latest | jq -r '.tag_name')
149149
;;
150150
"surface")
151+
if [[ "${{ matrix.fedora_version }}" < 41 ]]; then
151152
$dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
153+
else
154+
$dnf config-manager addrepo --from-repofile=https://pkg.surfacelinux.com/fedora/linux-surface.repo
155+
fi
152156
linux=$($dnf repoquery --repoid linux-surface --whatprovides kernel-surface | sort -V | tail -n1 | sed 's/.*://')
157+
153158
;;
154159
"main")
155160
base_image_name="base"

fetch.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ case "$kernel_flavor" in
2323
dnf copr enable -y sentry/kernel-ba
2424
;;
2525
"surface")
26-
dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
26+
if [[ "$(rpm -E %fedora)" -lt 41 ]]; then
27+
dnf config-manager --add-repo=https://pkg.surfacelinux.com/fedora/linux-surface.repo
28+
else
29+
dnf config-manager addrepo --from-repofile=https://pkg.surfacelinux.com/fedora/linux-surface.repo
30+
fi
2731
;;
2832
"coreos-stable")
2933
;;

0 commit comments

Comments
 (0)