Skip to content

Commit

Permalink
chore(CI): surface on f41 (#47)
Browse files Browse the repository at this point in the history
* chore(CI): surface on f41

* handle dnf5 for addrepo.

remove Asus 40

* handle dnf5 for surface

* correct flag

* correct flag
  • Loading branch information
m2Giles authored Jan 2, 2025
1 parent 1e906bb commit 69a9684
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ jobs:
- 40
- 41
exclude:
- fedora_version: 40
kernel_flavor: asus
- fedora_version: 41
kernel_flavor: fsync
- fedora_version: 41
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
;;
Expand Down

0 comments on commit 69a9684

Please sign in to comment.