From 2d1b0392373a0f9151e6eb7a110da83c751da5d9 Mon Sep 17 00:00:00 2001
From: renner <80410025+renner0e@users.noreply.github.com>
Date: Sat, 28 Mar 2026 20:59:02 +0100
Subject: [PATCH] chore(beta): adjust fedora version logic for beta in
 rechunker (#1972)

* chore(ci): remove akmods check for fedora version (#1966)

This is unnecessary and doesn't work all that well, caching is not super
well implemented anyway. Setting the fedora version per image tag
statically works just fine and if we were to set some version that is
not yet available then it will simply fail a couple seconds later on the
cosign verification or akmods image pull.

* chore(beta): adjust fedora version logic for beta in rechunker
---
 Justfile | 41 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/Justfile b/Justfile
index 7b5e8fb7..9875b049 100644
--- a/Justfile
+++ b/Justfile
@@ -285,7 +285,7 @@ rechunk $image="aurora" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
 
     # Image Name
     image_name=$({{ just }} image_name {{ image }} {{ tag }} {{ flavor }})
-    fedora_version=$(jq -r '.Labels["org.opencontainers.image.version"]' < /tmp/manifest.json | grep -oP '^[0-9]+')
+    fedora_version=$({{ just }} fedora_version '{{ image }}' '{{ tag }}' '{{ flavor }}')
     DEFAULT_TAG=$({{ just }} generate-default-tag {{ tag }} {{ ghcr }})
 
     if [[ "{{ ghcr }}" == "0" ]]; then
@@ -469,38 +469,17 @@ fedora_version image="aurora" tag="latest" flavor="main" $kernel_pin="":
     #!/usr/bin/bash
     set -eou pipefail
     {{ just }} validate {{ image }} {{ tag }} {{ flavor }}
-    if [[ ! -f /tmp/manifest.json ]]; then
-        # Determine Version
-        if [[ "{{ tag }}" =~ stable ]]; then
-            VERSION="{{ stable_version }}"
-        elif [[ "{{ tag }}" =~ beta ]]; then
-            VERSION="{{ beta_version }}"
-        else
-            VERSION="{{ latest_version }}"
-        fi
 
-        # Determine Akmods Flavor
-        if [[ "{{ tag }}" =~ stable ]]; then
-            AKMODS_FLAVOR="coreos-stable"
-        else
-            AKMODS_FLAVOR="main"
-        fi
-
-        # Verify akmods existence
-        echo "Checking for akmods: ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${VERSION}" >&2
-        if ! skopeo inspect --retry-times 3 "docker://ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${VERSION}" > /dev/null; then
-             echo "Error: Akmods not found for flavor ${AKMODS_FLAVOR} and version ${VERSION}" >&2
-             exit 1
-        fi
-
-        # Write cache
-        echo "{\"Labels\": {\"org.opencontainers.image.version\": \"${VERSION}\"}}" > /tmp/manifest.json
+    # Determine Version
+    if [[ "{{ tag }}" =~ stable ]]; then
+        VERSION="{{ stable_version }}"
+    elif [[ "{{ tag }}" =~ beta ]]; then
+        VERSION="{{ beta_version }}"
+    else
+        VERSION="{{ latest_version }}"
     fi
-    fedora_version=$(jq -r '.Labels["org.opencontainers.image.version"]' < /tmp/manifest.json | grep -oP '^[0-9]+')
-    if [[ -n "${kernel_pin:-}" ]]; then
-        fedora_version=$(echo "${kernel_pin}" | grep -oP 'fc\K[0-9]+')
-    fi
-    echo "${fedora_version}"
+
+    echo "${VERSION}"
 
 # Image Name
 [group('Utility')]