From 1e906bb29bf17bdc074e2ae0c9015844c6e294ce Mon Sep 17 00:00:00 2001 From: RoyalOughtness <129108030+RoyalOughtness@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:33:34 -0800 Subject: [PATCH] fix: pull main kernel version from base-atomic (#46) * fix: pull main kernel version from base-atomic * Update reusable-build.yml --- .github/workflows/reusable-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 91dd460..3996cc5 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -152,7 +152,11 @@ jobs: linux=$($dnf repoquery --repoid linux-surface --whatprovides kernel-surface | sort -V | tail -n1 | sed 's/.*://') ;; "main") - linux=$(skopeo inspect docker://quay.io/fedora-ostree-desktops/base:${{ matrix.fedora_version }} | jq -r '.Labels["ostree.linux"]' ) + base_image_name="base" + if [[ ${{ matrix.fedora_version }} > 40 ]]; then + base_image_name+="-atomic" + fi + linux=$(skopeo inspect docker://quay.io/fedora-ostree-desktops/$base_image_name:${{ matrix.fedora_version }} | jq -r '.Labels["ostree.linux"]' ) ;; "coreos-stable") coreos_kernel stable