luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tasks: inherit parallel option

Browse source
This commit is contained in:
Michiel Borkent 2021-05-08 16:21:54 +02:00
parent b5a1dce4ec
commit fe9370e04b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/babashka/impl/tasks.clj
View file

@ -269,7 +269,8 @@
#_#_dependees (tasks->dependees targets tasks) #_#_dependees (tasks->dependees targets tasks)
task-map (cond-> {} task-map (cond-> {}
enter (assoc :enter enter) enter (assoc :enter enter)
leave (assoc :leave leave))] leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))]
(if error (if error
[(binding [*out* *err*] [(binding [*out* *err*]
(println error)) 1] (println error)) 1]
@ -316,7 +317,8 @@
(concat requires (:requires task)) (concat requires (:requires task))
(assemble-task-1 (cond-> {:name task-name} (assemble-task-1 (cond-> {:name task-name}
enter (assoc :enter enter) enter (assoc :enter enter)
leave (assoc :leave leave)) leave (assoc :leave leave)
parallel? (assoc :parallel parallel?))
task parallel? true))] nil])] task parallel? true))] nil])]
(when @debug (when @debug
(binding [*out* *err*] (binding [*out* *err*]
@ -391,7 +393,8 @@
(defn run (defn run
([task] (run task nil)) ([task] (run task nil))
([task {:keys [:parallel]}] ([task {:keys [:parallel]
:or {parallel (:parallel (current-task))}}]
(let [[[expr]] (assemble-task task parallel)] (let [[[expr]] (assemble-task task parallel)]
(sci/eval-string* @ctx expr)))) (sci/eval-string* @ctx expr))))