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

[#934] pick up env vars from :extra-env in deps step

Browse source
This commit is contained in:
Michiel Borkent 2021-07-12 16:59:10 +02:00
parent bb50b6a942
commit 28f986e201
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps.clj

@ -1 +1 @@
Subproject commit 2d1f34b253d2f8a3e91c633e835cad987467aa38
Subproject commit 985e5ca7f9cb123f86a0747aded1ee98e1f3deee

6
src/babashka/impl/deps.clj
View file

@ -56,7 +56,7 @@
keywords) which will used to calculate classpath. The classpath is
then used to resolve dependencies in babashka."
([deps-map] (add-deps deps-map nil))
([deps-map {:keys [:aliases]}]
([deps-map {:keys [:aliases :extra-env]}]
(when-let [paths (:paths deps-map)]
(cp/add-classpath (str/join cp/path-sep paths)))
(when-let [deps-map (not-empty (dissoc deps-map :paths :tasks :raw :min-bb-version))]
@ -70,7 +70,8 @@
"-Sdeps-file" "" ;; we reset deps file so the local deps.edn isn't used
,]
args (conj args (str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases))))
cp (with-out-str (apply deps/-main args))
cp (with-out-str (binding [deps/*extra-env* extra-env]
(apply deps/-main args)))
cp (str/trim cp)
cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
(cp/add-classpath cp)))))
@ -110,6 +111,7 @@
*out* @sci/out
*err* @sci/err
deps/*dir* (:dir opts)
deps/*extra-env* (:extra-env opts)
deps/*process-fn* (fn
([cmd] (p/process cmd opts))
([cmd _] (p/process cmd opts)))