From fe9370e04b4f2fff04c6f1586bd3ac840a0487f5 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 8 May 2021 16:21:54 +0200 Subject: [PATCH] Tasks: inherit parallel option --- src/babashka/impl/tasks.clj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/babashka/impl/tasks.clj b/src/babashka/impl/tasks.clj index 43934dc6..d00be0e3 100644 --- a/src/babashka/impl/tasks.clj +++ b/src/babashka/impl/tasks.clj @@ -269,7 +269,8 @@ #_#_dependees (tasks->dependees targets tasks) task-map (cond-> {} enter (assoc :enter enter) - leave (assoc :leave leave))] + leave (assoc :leave leave) + parallel? (assoc :parallel parallel?))] (if error [(binding [*out* *err*] (println error)) 1] @@ -316,7 +317,8 @@ (concat requires (:requires task)) (assemble-task-1 (cond-> {:name task-name} enter (assoc :enter enter) - leave (assoc :leave leave)) + leave (assoc :leave leave) + parallel? (assoc :parallel parallel?)) task parallel? true))] nil])] (when @debug (binding [*out* *err*] @@ -391,7 +393,8 @@ (defn run ([task] (run task nil)) - ([task {:keys [:parallel]}] + ([task {:keys [:parallel] + :or {parallel (:parallel (current-task))}}] (let [[[expr]] (assemble-task task parallel)] (sci/eval-string* @ctx expr))))