Push: automaton-build to branch: la. Changes can be seen here ht…

…tps://github.com/hephaistox/automaton-build/tree/la`
hephaistox · Sep 23, 2024 · 9a4a6e4 · 9a4a6e4
1 parent 680016b
commit 9a4a6e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/bb/automaton_build/project/compile.clj b/src/bb/automaton_build/project/compile.clj
@@ -73,7 +73,7 @@
                           app-paths)
           s (build-writter)
           ;; This require is needed to go around this issue: https://github.com/babashka/pods/issues/72
-          _ (require 'clojure.tools.build.tasks.uber :reload)]
+          _ (require 'clojure.tools.build.api :reload)]
       (->> app-paths
            build-file/file-rich-list
            (mapv (fn [path]

diff --git a/src/bb/automaton_build/tasks/deploy.clj b/src/bb/automaton_build/tasks/deploy.clj
@@ -241,8 +241,7 @@
 
 (defn generate-pom-xml
   [app-dir as-lib pom-xml-license paths verbose?]
-  (let [_ (normalln "pom-xml generation")
-        pom-xml-status (pom-xml-status app-dir as-lib pom-xml-license paths)]
+  (let [pom-xml-status (pom-xml-status app-dir as-lib pom-xml-license paths)]
     (when (and verbose? (:msg pom-xml-status) (not (str/blank? (:msg pom-xml-status))))
       (normalln (:msg pom-xml-status)))
     pom-xml-status))
@@ -356,12 +355,15 @@
                                 [cc clojars])]
         (do (h2-error! app-name " deployment failed:" failed-res)
             {:status :failed
+             :app-name app-name
              :res failed-res})
         (do (print clear-prev-line)
             (h2-valid app-name " deployment suceeded")
             {:status :success
+             :app-name app-name
              :res [cc clojars]})))
     {:status :failed
+     :app-name app-name
      :msg (str "Push to " base-branch " failed")}))
 
 
@@ -493,8 +495,8 @@
               (normalln)
               (mapv (fn [res]
                       (cond
-                        (= :success (:status res))
-                        (apply h1-valid! (:app-name res) " successfully deployed")
+                        (= :success (:status res)) (h1-valid! (:app-name res)
+                                                              " successfully deployed")
                         (= :skipped (:status res))
                         (normalln (:app-name res) " skipped due to " (:message res))
                         :else (h1-error! (:app-name res) " failed with: " res)))

diff --git a/version.edn b/version.edn
@@ -1 +1 @@
-{:version "3.2.0-42-la"}
+{:version "3.2.0-43-la"}