diff --git a/.circleci/script/release b/.circleci/script/release index 4579ac5f..48e9b2ab 100755 --- a/.circleci/script/release +++ b/.circleci/script/release @@ -29,4 +29,5 @@ BABASHKA_EDN=".build/bb.edn" ./bb release-artifact "/tmp/release/$archive" ## cleanup +cd /tmp/release rm bb # bbk diff --git a/script/babashka/release_artifact.clj b/script/babashka/release_artifact.clj index c3db8076..3132d9df 100644 --- a/script/babashka/release_artifact.clj +++ b/script/babashka/release_artifact.clj @@ -4,9 +4,12 @@ [clojure.string :as str])) (defn current-branch [] - (-> (sh "git" "rev-parse" "--abbrev-ref" "HEAD") - :out - str/trim)) + (or (System/getenv "APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH") + (System/getenv "APPVEYOR_REPO_BRANCH") + (System/getenv "CIRCLE_BRANCH") + (-> (sh "git" "rev-parse" "--abbrev-ref" "HEAD") + :out + str/trim))) (defn release [& args] (let [current-version (-> (slurp "resources/BABASHKA_VERSION")