From 8f6f7d26e33f5b6664042a41a05545e94bc53b97 Mon Sep 17 00:00:00 2001 From: m2 <69128853+m2Giles@users.noreply.github.com> Date: Sun, 10 Nov 2024 23:08:05 -0500 Subject: [PATCH 1/3] feat: enable coreos-stable on F41 --- .github/workflows/reusable-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index b60c304..6468b8e 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -44,6 +44,8 @@ jobs: exclude: - fedora_version: 39 kernel_flavor: asus + - fedora_version: 39 + kernel_flavor: coreos-stable - fedora_version: 39 kernel_flavor: coreos-testing - fedora_version: 39 @@ -58,8 +60,6 @@ jobs: kernel_flavor: bazzite - fedora_version: 40 kernel_flavor: bazzite - - fedora_version: 41 - kernel_flavor: coreos-stable - fedora_version: 40 kernel_flavor: coreos-testing - fedora_version: 41 From cb9f65393eed2dba9991b66900166939bca00086 Mon Sep 17 00:00:00 2001 From: m2 <69128853+m2Giles@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:05:26 -0500 Subject: [PATCH 2/3] pin a working coreos-stable kernel --- .github/workflows/reusable-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 6468b8e..6586a9d 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -97,6 +97,10 @@ jobs: coreos_kernel () { coreos_version=${1} image_linux=$(skopeo inspect docker://quay.io/fedora/fedora-coreos:${coreos_version} | jq -r '.Labels["ostree.linux"]') + # Gross Pin... But workaround coreos-stable being on a broken kernel... + if [[ "${{ matrix.kernel_flavor }}" == "coreos-stable" ]]; then + image_linux=6.11.3-300.fc41.x86_64 + fi major_minor_patch=$(echo $image_linux | grep -oP '^\d+\.\d+\.\d+') kernel_rel_part=$(echo $image_linux | grep -oP '^\d+\.\d+\.\d+\-\K([123][0]{2})') arch=$(echo $image_linux | grep -oP 'fc\d+\.\K.*$') From 61e517944761b0f4603b0373b1996f414ca850ad Mon Sep 17 00:00:00 2001 From: m2 <69128853+m2Giles@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:05:57 -0500 Subject: [PATCH 3/3] Update reusable-build.yml --- .github/workflows/reusable-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 6586a9d..76fe467 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -99,7 +99,7 @@ jobs: image_linux=$(skopeo inspect docker://quay.io/fedora/fedora-coreos:${coreos_version} | jq -r '.Labels["ostree.linux"]') # Gross Pin... But workaround coreos-stable being on a broken kernel... if [[ "${{ matrix.kernel_flavor }}" == "coreos-stable" ]]; then - image_linux=6.11.3-300.fc41.x86_64 + image_linux="6.11.3-300.fc41.x86_64" fi major_minor_patch=$(echo $image_linux | grep -oP '^\d+\.\d+\.\d+') kernel_rel_part=$(echo $image_linux | grep -oP '^\d+\.\d+\.\d+\-\K([123][0]{2})')