[describe] use BABASHKA_SHA

.circleci/script/gen_ci.clj

@@ -84,7 +84,8 @@
                         :BABASHKA_PLATFORM "linux"
                         :GRAALVM_VERSION   graalvm-version
                         :GRAALVM_HOME      graalvm-home
-                        :BABASHKA_TEST_ENV "jvm"}
+                        :BABASHKA_TEST_ENV "jvm"
+                        :BABASHKA_SHA (System/getenv "CIRCLE_SHA1")}
     :resource_class    "large"
     :steps
     (gen-steps
@@ -128,7 +129,8 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
                                                "macos"
                                                platform)
                           :BABASHKA_TEST_ENV "native"
-                          :BABASHKA_XMX      "-J-Xmx6500m"}
+                          :BABASHKA_XMX      "-J-Xmx6500m"
+                          :BABASHKA_SHA (System/getenv "CIRCLE_SHA1")}
         env              (if (= "aarch64" arch)
                            (assoc env :BABASHKA_ARCH arch)
                            env)

.cirrus.yml

@@ -12,6 +12,7 @@ task:
     BABASHKA_TEST_ENV: native
     BABASHKA_XMX: "-J-Xmx6500m"
     GITHUB_TOKEN: ENCRYPTED[d6ff8cdc392157f211c754fa0763875434d1bfde0c00a05e48ba9470003a76c14c9213adb80623f81e13f2f0fa8fbd57]
+    BABASHKA_SHA: ${CIRRUS_BASE_SHA}
   script: |
     git submodule init
     git submodule update

appveyor.yml

@@ -61,6 +61,8 @@ build_script:
 # see https://github.com/quarkusio/quarkus/pull/7663
 
 - cmd: >-
+    set BABASHKA_SHA=%APPVEYOR_REPO_COMMIT%
+
     call script/uberjar.bat
 
     call script/compile.bat

resources/META-INF/native-image/babashka/babashka/native-image.properties

@@ -53,4 +53,5 @@ Args=-H:+ReportExceptionStackTraces \
      -EBABASHKA_FEATURE_LANTERNA \
      -EBABASHKA_FEATURE_SPEC_ALPHA \
      -EBABASHKA_FEATURE_RRB_VECTOR \
-     -EBABASHKA_REQUIRE_SCAN
+     -EBABASHKA_REQUIRE_SCAN \
+     -EBABASHKA_SHA

script/compile

@@ -107,4 +107,12 @@ then
     export BABASHKA_FEATURE_PRIORITY_MAP="${BABASHKA_FEATURE_PRIORITY_MAP:-false}"
 fi
 
+if [[ ! -f "$BABASHKA_SHA" ]]
+then
+    sha=$(git rev-parse HEAD)
+    if [[ $? -eq 0 ]]; then
+        export BABASHKA_SHA=$sha
+    fi
+fi
+
 "$GRAALVM_HOME/bin/native-image" "${args[@]}" "$@"

script/compile.bat

@@ -23,6 +23,13 @@ Rem -H:EnableURLProtocols=jar,http,https is also not supported.
 
 call %GRAALVM_HOME%\bin\gu.cmd install native-image
 
+if not exist "%BABASHKA_SHA%" (
+    for /f %%i in ('git rev-parse HEAD') do set sha=%%i
+    if not errorlevel 1 (
+        set BABASHKA_SHA=%sha%
+    )
+)
+
 call %GRAALVM_HOME%\bin\native-image.cmd ^
   "-jar" "target/babashka-%BABASHKA_VERSION%-standalone.jar" ^
   "-H:Name=bb" ^

src/babashka/main.clj

@@ -110,10 +110,7 @@
 
 (def version common/version)
 
-(def build-commit-sha
-  (or (System/getenv "CIRCLE_SHA1")
-      (System/getenv "APPVEYOR_REPO_COMMIT")
-      (System/getenv "CIRRUS_BASE_SHA")))
+(def build-commit-sha (System/getenv "BABASHKA_SHA"))
 
 (defn parse-version [version]
   (mapv #(Integer/parseInt %)
@@ -265,8 +262,7 @@ Use bb run --help to show this help output.
   (println
    (format
     (str/trim "
-{:babashka/version   \"%s\"
- :git/sha            \"%s\"
+{:babashka/version   \"%s\"%s
  :feature/csv        %s
  :feature/java-nio   %s
  :feature/java-time  %s
@@ -287,7 +283,9 @@ Use bb run --help to show this help output.
  :feature/logging %s
  :feature/priority-map %s}")
     version
-    build-commit-sha
+    (if (or (nil? build-commit-sha) (str/blank? build-commit-sha))
+      ""
+      (format " \n:git/sha \"%s\"" build-commit-sha))
     features/csv?
     features/java-nio?
     features/java-time?