Fix git-sha display

clojure-goes-fast · Nov 12, 2024 · 2a61266 · 2a61266
1 parent 25943d2
commit 2a61266
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/flamebin/config.clj b/src/flamebin/config.clj
@@ -24,15 +24,14 @@
 
    :build {:nested
            {:version {:type :string
-                      :default "unknown"
-                      :delayed-transform
-                      #(if (and (= % "unknown") (.exists (io/file "VERSION")))
-                         (slurp "VERSION") %)}
+                      :default #(if (.exists (io/file "VERSION"))
+                                  (slurp "VERSION")
+                                  "unknown")}
             :git-sha {:type :string
-                      :default "master"
-                      :delayed-transform
-                      #(if (and (= % "master") (.exists (io/file "GIT_SHA")))
-                         (slurp "GIT_SHA") %)}}}
+                      :default #(or (and (.exists (io/file "GIT_SHA"))
+                                         (some-> (slurp "GIT_SHA") not-empty
+                                                 (subs 0 6)))
+                                    "master")}}}
    :storage {:nested
              {:kind {:type :keyword
                      :default :disk}