From 8692f825bc857639dbe5c08a5fbbf9ddac93daa5 Mon Sep 17 00:00:00 2001
From: Mikhail Chusavitin <mchusavitin@mchusmbp.local>
Date: Fri, 3 Apr 2026 10:48:51 +0300
Subject: [PATCH] Use plain repo tags for build version

---
 audit/cmd/bee/main_test.go       | 4 ----
 audit/scripts/resolve-version.sh | 8 +-------
 iso/builder/build.sh             | 9 +--------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/audit/cmd/bee/main_test.go b/audit/cmd/bee/main_test.go
index dfa6d3f..e326f55 100644
--- a/audit/cmd/bee/main_test.go
+++ b/audit/cmd/bee/main_test.go
@@ -46,8 +46,6 @@ func TestRunUnknownCommand(t *testing.T) {
 }
 
 func TestRunVersion(t *testing.T) {
-	t.Parallel()
-
 	old := Version
 	Version = "test-version"
 	t.Cleanup(func() { Version = old })
@@ -63,8 +61,6 @@ func TestRunVersion(t *testing.T) {
 }
 
 func TestBuildLabelUsesVersionAsIs(t *testing.T) {
-	t.Parallel()
-
 	old := Version
 	Version = "1.2.3"
 	t.Cleanup(func() { Version = old })
diff --git a/audit/scripts/resolve-version.sh b/audit/scripts/resolve-version.sh
index d219a50..5349967 100755
--- a/audit/scripts/resolve-version.sh
+++ b/audit/scripts/resolve-version.sh
@@ -1,15 +1,9 @@
 #!/bin/sh
 set -eu
 
-tag="$(git describe --tags --match 'audit/v*' --abbrev=7 --dirty 2>/dev/null || true)"
-if [ -z "${tag}" ]; then
-	tag="$(git describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
-fi
+tag="$(git describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
 
 case "${tag}" in
-	audit/v*)
-		printf '%s\n' "${tag#audit/v}"
-		;;
 	v*)
 		printf '%s\n' "${tag#v}"
 		;;
diff --git a/iso/builder/build.sh b/iso/builder/build.sh
index feb3743..5c2e8c3 100755
--- a/iso/builder/build.sh
+++ b/iso/builder/build.sh
@@ -54,15 +54,8 @@ resolve_audit_version() {
         return 0
     fi
 
-    tag="$(git -C "${REPO_ROOT}" describe --tags --match 'audit/v*' --abbrev=7 --dirty 2>/dev/null || true)"
-    if [ -z "${tag}" ]; then
-        tag="$(git -C "${REPO_ROOT}" describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
-    fi
+    tag="$(git -C "${REPO_ROOT}" describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
     case "${tag}" in
-        audit/v*)
-            echo "${tag#audit/v}"
-            return 0
-            ;;
         v*)
             echo "${tag#v}"
             return 0