Skip to content

Commit

Permalink
Merge branch '1.1.x' into 1.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
shakuzen committed Sep 30, 2019
2 parents 1082d2b + e653b2f commit 3bf6f15
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gradle/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ elif [ $CIRCLE_TAG ]; then
openssl aes-256-cbc -d -in gradle.properties.enc -out gradle.properties -k "$KEY" -md sha256
case "$CIRCLE_TAG" in
*-rc\.*)
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true candidate $SWITCHES -x release -x bintrayPublish
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true candidate bintrayUpload $SWITCHES -x release -x bintrayPublish
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true :micrometer-core:bintrayPublish $SWITCHES -x bintrayUpload
;;
*)
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true final $SWITCHES -x release -x artifactoryPublish -x bintrayPublish
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true final bintrayUpload $SWITCHES -x release -x artifactoryPublish -x bintrayPublish
./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true :micrometer-core:bintrayPublish $SWITCHES -x bintrayUpload
;;
esac
Expand Down

0 comments on commit 3bf6f15

Please sign in to comment.