From 589ad97b642f779d036500a253d587f403c0678e Mon Sep 17 00:00:00 2001
From: tranch <tranch.xiao@gmail.com>
Date: Fri, 28 Aug 2026 17:44:13 +0800
Subject: fix: validate image Fedora version

---
 .github/workflows/build-installer-iso.yml | 3 ++-
 .github/workflows/build.yml               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-installer-iso.yml b/.github/workflows/build-installer-iso.yml
index 2402dfe..d8faa69 100644
--- a/.github/workflows/build-installer-iso.yml
+++ b/.github/workflows/build-installer-iso.yml
@@ -73,12 +73,13 @@ jobs:
           sudo podman run --rm --entrypoint /usr/bin/bash \
             "${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" -ceu '
               system_release_target=$(readlink -f /etc/system-release)
+              fedora_version=$(jq -er '."fedora-version" | strings' /usr/share/ublue-os/image-info.json)
               if od -An -v -tx1 "$system_release_target" | awk '\''{ for (i = 1; i <= NF; i++) if ($i == "00") found = 1 } END { exit(found ? 0 : 1) }'\''; then
                 echo "NUL byte in ${system_release_target}" >&2
                 exit 1
               fi
               case "$(<"$system_release_target")" in
-                "AeroCore OS release $(rpm -E %fedora) ("*) ;;
+                "AeroCore OS release ${fedora_version} ("*) ;;
                 *)
                   echo "Unexpected system-release: $(<"$system_release_target")" >&2
                   exit 1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f27a1bb..60104ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -168,12 +168,13 @@ jobs:
           sudo podman run --rm --entrypoint /usr/bin/bash \
             "${IMAGE_NAME}:${DEFAULT_TAG}" -ceu '
               system_release=/etc/system-release
+              fedora_version=$(jq -er '."fedora-version" | strings' /usr/share/ublue-os/image-info.json)
               if od -An -v -tx1 "$system_release" | awk '\''{ for (i = 1; i <= NF; i++) if ($i == "00") found = 1 } END { exit(found ? 0 : 1) }'\''; then
                 echo "NUL byte in ${system_release}" >&2
                 exit 1
               fi
               case "$(<"$system_release")" in
-                "AeroCore OS release $(rpm -E %fedora) ("*) ;;
+                "AeroCore OS release ${fedora_version} ("*) ;;
                 *)
                   echo "Unexpected system-release: $(<"$system_release")" >&2
                   exit 1
-- 
cgit v1.2.3