reanimator/bee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use plain repo tags for build version

Browse Source
This commit is contained in:
Mikhail Chusavitin
2026-04-03 10:48:51 +03:00
parent 11f52ac710
commit 8692f825bc
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audit/cmd/bee/main_test.go
View File

@@ -46,8 +46,6 @@ func TestRunUnknownCommand(t *testing.T) {
} }
func TestRunVersion(t *testing.T) { func TestRunVersion(t *testing.T) {
t.Parallel()
old := Version old := Version
Version = "test-version" Version = "test-version"
t.Cleanup(func() { Version = old }) t.Cleanup(func() { Version = old })
@@ -63,8 +61,6 @@ func TestRunVersion(t *testing.T) {
} }
func TestBuildLabelUsesVersionAsIs(t *testing.T) { func TestBuildLabelUsesVersionAsIs(t *testing.T) {
t.Parallel()
old := Version old := Version
Version = "1.2.3" Version = "1.2.3"
t.Cleanup(func() { Version = old }) t.Cleanup(func() { Version = old })

6
audit/scripts/resolve-version.sh
View File

@@ -1,15 +1,9 @@
#!/bin/sh #!/bin/sh
set -eu 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)" tag="$(git describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
fi
case "${tag}" in case "${tag}" in
audit/v*)
printf '%s\n' "${tag#audit/v}"
;;
v*) v*)
printf '%s\n' "${tag#v}" printf '%s\n' "${tag#v}"
;; ;;

7
iso/builder/build.sh
View File

@@ -54,15 +54,8 @@ resolve_audit_version() {
return 0 return 0
fi 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)" tag="$(git -C "${REPO_ROOT}" describe --tags --match 'v[0-9]*' --abbrev=7 --dirty 2>/dev/null || true)"
fi
case "${tag}" in case "${tag}" in
audit/v*)
echo "${tag#audit/v}"
return 0
;;
v*) v*)
echo "${tag#v}" echo "${tag#v}"
return 0 return 0