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

Fix parallel tasks

Browse source
This commit is contained in:
Michiel Borkent 2021-04-11 23:20:27 +02:00
parent e1cfdc6e23
commit f18ec3feeb
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,8 +81,10 @@
(defn assemble-task-1 (defn assemble-task-1
"Assembles task, does not process :depends." "Assembles task, does not process :depends."
([task-name task depends] (assemble-task-1 task-name task depends nil)) ([task-name task]
([task-name task depends last?] (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) (cond (qualified-symbol? task)
(let [prog (format "(apply %s *command-line-args*)" task) (let [prog (format "(apply %s *command-line-args*)" task)
prog (wrap-depends prog depends) prog (wrap-depends prog depends)
@ -95,7 +97,7 @@
prog) prog)
(map? task) (map? task)
(let [t (:task 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)] :else (let [prog (wrap-depends task depends)]
(wrap-def task-name prog last?))))) (wrap-def task-name prog last?)))))
@ -135,7 +137,7 @@
targets (next targets)] targets (next targets)]
(if targets (if targets
(if-let [task (get tasks t)] (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) targets)
[(binding [*out* *err*] [(binding [*out* *err*]
(println "No such task:" task-name)) 1]) (println "No such task:" task-name)) 1])
@ -143,11 +145,11 @@
(let [prog (str prog "\n" (let [prog (str prog "\n"
(apply str (map deref-task depends)) (apply str (map deref-task depends))
"\n" "\n"
(assemble-task-1 t task depends true))] (assemble-task-1 t task true))]
[[(format-task init prog)] nil]) [[(format-task init prog)] nil])
[(binding [*out* *err*] [(binding [*out* *err*]
(println "No such task:" task-name)) 1]))))) (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")) (when (= "true" (System/getenv "BABASHKA_DEV"))
(println (ffirst prog))) (println (ffirst prog)))
prog) prog)