Revert "CI: publish branches prefixed with 'patch_release'"

This commit is contained in:
Tyler Benson 2018-03-05 12:52:37 +10:00 committed by GitHub
parent d1ccb2e724
commit 7e700eaf1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions

View File

@ -137,7 +137,9 @@ jobs:
-PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \ -PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \
artifactoryPublish --max-workers=1 --stacktrace --no-daemon artifactoryPublish --max-workers=1 --stacktrace --no-daemon
publish_branch: publish_master:
<<: *publish
publish_tag:
<<: *publish <<: *publish
workflows: workflows:
@ -175,15 +177,24 @@ workflows:
branches: branches:
ignore: master ignore: master
- publish_branch: - publish_master:
requires: requires:
- test_7 - test_7
- test_8 - test_8
- test_9 - test_9
filters: filters:
branches: branches:
only: only: master
- master
- /patch_release.*/
tags: tags:
ignore: /.*/ ignore: /.*/
- publish_tag:
requires:
- test_7
- test_8
- test_9
filters:
branches:
ignore: /.*/
tags:
only: /^v.*/

View File

@ -63,6 +63,7 @@ if (!isRoot) {
} }
def isSnapshot = version.endsWith("-SNAPSHOT") def isSnapshot = version.endsWith("-SNAPSHOT")
def isCIandTagged = System.getenv("CIRCLE_TAG") != null
// define in ~/.gradle/gradle.properties to override for testing // define in ~/.gradle/gradle.properties to override for testing
def forceLocal = project.hasProperty('forceLocal') && forceLocal def forceLocal = project.hasProperty('forceLocal') && forceLocal
@ -151,6 +152,6 @@ bintray {
} }
} }
if (!isSnapshot) { if (!isSnapshot && isCIandTagged) {
artifactoryPublish.finalizedBy bintrayUpload artifactoryPublish.finalizedBy bintrayUpload
} }