Use correct branch on appveyor
This commit is contained in:
parent
acd9c389f9
commit
24c4c62ae3
2 changed files with 7 additions and 3 deletions
|
|
@ -29,4 +29,5 @@ BABASHKA_EDN=".build/bb.edn" ./bb release-artifact "/tmp/release/$archive"
|
||||||
|
|
||||||
## cleanup
|
## cleanup
|
||||||
|
|
||||||
|
cd /tmp/release
|
||||||
rm bb # bbk
|
rm bb # bbk
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,12 @@
|
||||||
[clojure.string :as str]))
|
[clojure.string :as str]))
|
||||||
|
|
||||||
(defn current-branch []
|
(defn current-branch []
|
||||||
|
(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")
|
(-> (sh "git" "rev-parse" "--abbrev-ref" "HEAD")
|
||||||
:out
|
:out
|
||||||
str/trim))
|
str/trim)))
|
||||||
|
|
||||||
(defn release [& args]
|
(defn release [& args]
|
||||||
(let [current-version (-> (slurp "resources/BABASHKA_VERSION")
|
(let [current-version (-> (slurp "resources/BABASHKA_VERSION")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue