diff --git a/.circleci/script/docker b/.circleci/script/docker index 315aeb8e..f16447b6 100755 --- a/.circleci/script/docker +++ b/.circleci/script/docker @@ -49,7 +49,7 @@ if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" = "master" ]; then tar zxvf "/tmp/release/babashka-${image_tag}-linux-amd64-static.tar.gz" echo "Building & pushing Docker image $image_name:$image_tag-alpine" docker buildx build -t "$image_name:$image_tag-alpine" --platform=linux/amd64 "${label_args[@]}" --push -f Dockerfile.alpine . - rm -f bb + if [[ $snapshot == "false" ]]; then echo "Building & pushing Docker image $image_name:alpine" docker buildx build -t "$image_name:alpine" --platform=linux/amd64 "${label_args[@]}" --push -f Dockerfile.alpine . diff --git a/CHANGELOG.md b/CHANGELOG.md index 872faf6b..4f9d9671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ For a list of breaking changes, check [here](#breaking-changes). - SCI: fix order of metadata evaluation ([@erdos](https://github.com/erdos)) - Fix: cannot take value of macro of `->` - Fix [#1144](https://github.com/babashka/babashka/issues/1144): cannot create multidimensional arrays -- Fix [#1143](https://github.com/babashka/babashka/issues/1143): allow optional (ignored) -- when using using --main ([@grzm](https://github.com/grzm)) +- Fix [#1143](https://github.com/babashka/babashka/issues/1143): allow optional (ignored) `--` when using using `--main` ([@grzm](https://github.com/grzm)) - SCI: throw when `recur` is used from non-tail position - Add more libraries to CI lib tests ([@cljwalker](https://github.com/cljwalker)) - Upgrade several built-in deps: `org.clojure/clojure`, `cheshire`, `core.async`, `test.check`