[describe] simpler sha key, test print
This commit is contained in:
parent
1dd0440bde
commit
508cb3bc9d
3 changed files with 6 additions and 4 deletions
|
|
@ -116,3 +116,5 @@ then
|
|||
fi
|
||||
|
||||
"$GRAALVM_HOME/bin/native-image" "${args[@]}" "$@"
|
||||
|
||||
$BABASHKA_BINARY describe
|
||||
|
|
|
|||
|
|
@ -46,3 +46,4 @@ call %GRAALVM_HOME%\bin\native-image.cmd ^
|
|||
if %errorlevel% neq 0 exit /b %errorlevel%
|
||||
|
||||
call bb "(+ 1 2 3)"
|
||||
call bb describe
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
(def version common/version)
|
||||
|
||||
(def build-commit-sha (System/getenv "BABASHKA_SHA"))
|
||||
(def build-commit-sha (or (System/getenv "BABASHKA_SHA") ""))
|
||||
|
||||
(defn parse-version [version]
|
||||
(mapv #(Integer/parseInt %)
|
||||
|
|
@ -263,6 +263,7 @@ Use bb run --help to show this help output.
|
|||
(format
|
||||
(str/trim "
|
||||
{:babashka/version \"%s\"%s
|
||||
:git/sha \"%s\"
|
||||
:feature/csv %s
|
||||
:feature/java-nio %s
|
||||
:feature/java-time %s
|
||||
|
|
@ -283,9 +284,7 @@ Use bb run --help to show this help output.
|
|||
:feature/logging %s
|
||||
:feature/priority-map %s}")
|
||||
version
|
||||
(if (or (nil? build-commit-sha) (str/blank? build-commit-sha))
|
||||
""
|
||||
(format " \n:git/sha \"%s\"" build-commit-sha))
|
||||
build-commit-sha
|
||||
features/csv?
|
||||
features/java-nio?
|
||||
features/java-time?
|
||||
|
|
|
|||
Loading…
Reference in a new issue