luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[describe] simpler sha key, test print

Browse source
This commit is contained in:
Rahul De 2024-10-13 15:47:56 +01:00
parent 1dd0440bde
commit 508cb3bc9d
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/compile
View file

@ -116,3 +116,5 @@ then
fi fi
"$GRAALVM_HOME/bin/native-image" "${args[@]}" "$@" "$GRAALVM_HOME/bin/native-image" "${args[@]}" "$@"
$BABASHKA_BINARY describe

1
script/compile.bat
View file

@ -46,3 +46,4 @@ call %GRAALVM_HOME%\bin\native-image.cmd ^
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%
call bb "(+ 1 2 3)" call bb "(+ 1 2 3)"
call bb describe

7
src/babashka/main.clj
View file

@ -110,7 +110,7 @@
(def version common/version) (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] (defn parse-version [version]
(mapv #(Integer/parseInt %) (mapv #(Integer/parseInt %)
@ -263,6 +263,7 @@ Use bb run --help to show this help output.
(format (format
(str/trim " (str/trim "
{:babashka/version \"%s\"%s {:babashka/version \"%s\"%s
:git/sha \"%s\"
:feature/csv %s :feature/csv %s
:feature/java-nio %s :feature/java-nio %s
:feature/java-time %s :feature/java-time %s
@ -283,9 +284,7 @@ Use bb run --help to show this help output.
:feature/logging %s :feature/logging %s
:feature/priority-map %s}") :feature/priority-map %s}")
version version
(if (or (nil? build-commit-sha) (str/blank? build-commit-sha)) build-commit-sha
""
(format " \n:git/sha \"%s\"" build-commit-sha))
features/csv? features/csv?
features/java-nio? features/java-nio?
features/java-time? features/java-time?