master: Unbreak generate-version.sh

stassats via Sbcl-commits <[email protected]> Fri, 29 May 2026 21:50:29 +0000
Newsgroups gmane.lisp.steel-bank.cvs
Message-ID <[email protected]>
The branch "master" has been updated in SBCL:
       via  300478c4e14f5211638c831f8629154e300f87dc (commit)
      from  85913ede1fe258d8d7443dfa2c666e688fd31836 (commit)

- Log -----------------------------------------------------------------
commit 300478c4e14f5211638c831f8629154e300f87dc
Author: Stas Boukarev <[email protected]>
Date:   Sat May 30 00:21:48 2026 +0300

    Unbreak generate-version.sh
    
    Don't include the hash if it's at a release tag
---
 generate-version.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/generate-version.sh b/generate-version.sh
index c7a8f181d..db40fe4ff 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -78,9 +78,15 @@ else
 fi
 if [ "$version_base" = "$version_head" ]
 then
-    printf "\"%s%s%s%s\"\n" \
-           $version_release "$version_n_root_pretty" \
-           $version_hash $version_dirty >>version.lisp-expr
+    if [ "0" = "$version_n_root" ]
+    then
+        printf "\"%s%s\"\n" \
+            $version_release $version_dirty >>version.lisp-expr
+    else
+        printf "\"%s.%s%s%s\"\n" \
+            $version_release $version_n_root \
+            $version_hash $version_dirty >>version.lisp-expr
+    fi
 else
     echo "base=$version_base"
     echo "head=$version_head"

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL