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

v1.3.178

Browse source
This commit is contained in:
Michiel Borkent 2023-04-21 15:52:07 +02:00
parent cd4987b005
commit 1de5c553ea
3 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -11,6 +11,10 @@ A preview of the next release can be installed from
Berlin. Save the date and/or submit your babashka/clojure-related 20 minute talk Berlin. Save the date and/or submit your babashka/clojure-related 20 minute talk
in the CfP! in the CfP!
## 1.3.178 (2023-04-18)
- Fix regression with [#1541](https://github.com/babashka/babashka/issues/1541)
## 1.3.177 (2023-04-18) ## 1.3.177 (2023-04-18)
- [#1541](https://github.com/babashka/babashka/issues/1541): respect `bb.edn` - [#1541](https://github.com/babashka/babashka/issues/1541): respect `bb.edn`

2
resources/BABASHKA_VERSION
View file

@ -1 +1 @@
1.3.178-SNAPSHOT 1.3.178

9
src/babashka/main.clj
View file

@ -1132,9 +1132,14 @@ Use bb run --help to show this help output.
config (when (fs/exists? config) (abs-path config)) config (when (fs/exists? config) (abs-path config))
jar (some-> [jar] cp/new-loader (cp/resource "META-INF/bb.edn") .toString) jar (some-> [jar] cp/new-loader (cp/resource "META-INF/bb.edn") .toString)
:else (if (and file (fs/exists? file)) :else (if (and file (fs/exists? file))
;; file relative to bb.edn
(let [rel-bb-edn (fs/file (fs/parent file) "bb.edn")] (let [rel-bb-edn (fs/file (fs/parent file) "bb.edn")]
(when (fs/exists? rel-bb-edn) (if (fs/exists? rel-bb-edn)
(abs-path rel-bb-edn))) (abs-path rel-bb-edn)
;; fall back to local bb.edn
(when (fs/exists? "bb.edn")
(abs-path "bb.edn"))))
;; default to local bb.edn
(when (fs/exists? "bb.edn") (when (fs/exists? "bb.edn")
(abs-path "bb.edn")))) (abs-path "bb.edn"))))
bb-edn (when (or bb-edn-file merge-deps) bb-edn (when (or bb-edn-file merge-deps)