From f18ec3feeb932b0958ca84f901bcaa4a261e3664 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 11 Apr 2021 23:20:27 +0200 Subject: [PATCH] Fix parallel tasks --- src/babashka/impl/tasks.clj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/babashka/impl/tasks.clj b/src/babashka/impl/tasks.clj index 283b4cde..bf249f75 100644 --- a/src/babashka/impl/tasks.clj +++ b/src/babashka/impl/tasks.clj @@ -81,8 +81,10 @@ (defn assemble-task-1 "Assembles task, does not process :depends." - ([task-name task depends] (assemble-task-1 task-name task depends nil)) - ([task-name task depends last?] + ([task-name task] + (assemble-task-1 task-name task nil nil)) + ([task-name task last?] (assemble-task-1 task-name task last? nil)) + ([task-name task last? depends] (cond (qualified-symbol? task) (let [prog (format "(apply %s *command-line-args*)" task) prog (wrap-depends prog depends) @@ -95,7 +97,7 @@ prog) (map? task) (let [t (:task task)] - (assemble-task-1 task-name t (:depends task) last?)) + (assemble-task-1 task-name t last? (:depends task))) :else (let [prog (wrap-depends task depends)] (wrap-def task-name prog last?))))) @@ -135,7 +137,7 @@ targets (next targets)] (if targets (if-let [task (get tasks t)] - (recur (str prog "\n" (assemble-task-1 t task depends)) + (recur (str prog "\n" (assemble-task-1 t task)) targets) [(binding [*out* *err*] (println "No such task:" task-name)) 1]) @@ -143,11 +145,11 @@ (let [prog (str prog "\n" (apply str (map deref-task depends)) "\n" - (assemble-task-1 t task depends true))] + (assemble-task-1 t task true))] [[(format-task init prog)] nil]) [(binding [*out* *err*] (println "No such task:" task-name)) 1]))))) - [[(format-task init (assemble-task-1 task-name task []))] nil])] + [[(format-task init (assemble-task-1 task-name task true))] nil])] (when (= "true" (System/getenv "BABASHKA_DEV")) (println (ffirst prog))) prog)