Raymond Toy pushed to branch issue-464-lisp-version-uses-branch-name at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • bin/git-version.sh
    ... ... @@ -51,7 +51,7 @@ else
    51 51
     	# However, we have to remove everything before the first slash
    
    52 52
     	# which contains things like "tags/", "head/", or "pipelines/"
    
    53 53
     	# (from CI).
    
    54
    -	GIT_DESC="`git describe --all --dirty || git describe 2>/dev/null`"
    
    54
    +	GIT_DESC="`git describe --dirty || git describe 2>/dev/null`"
    
    55 55
     	GIT_HASH="`echo ${GIT_DESC} | sed 's;^[^/]*/;;' 2>/dev/null`"
    
    56 56
     
    
    57 57
     	case "$GIT_HASH" in
    
    ... ... @@ -65,7 +65,7 @@ else
    65 65
     		# Use it as is.
    
    66 66
     		DEFAULT_VERSION="${GIT_HASH}"
    
    67 67
     		;;
    
    68
    -	    [0-9]*)
    
    68
    +	    [0-9][0-9][0-9][0-9][0-9]*)
    
    69 69
     		# Assuming this is CI which seems to produce a githash like
    
    70 70
     		# "pipeline/<digits>".  Make the version include "ci-" so we
    
    71 71
     		# know this was done via CI.