Skip to content

Commit ebee71d

Browse files
author
Andrew Kent
committed
CI: publish branches prefixed with 'patch_release'
1 parent a05623d commit ebee71d

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

.circleci/config.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ jobs:
137137
-PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \
138138
artifactoryPublish --max-workers=1 --stacktrace --no-daemon
139139
140-
publish_master:
141-
<<: *publish
142-
publish_tag:
140+
publish_branch:
143141
<<: *publish
144142

145143
workflows:
@@ -177,24 +175,15 @@ workflows:
177175
branches:
178176
ignore: master
179177

180-
- publish_master:
178+
- publish_branch:
181179
requires:
182180
- test_7
183181
- test_8
184182
- test_9
185183
filters:
186184
branches:
187-
only: master
185+
only:
186+
- master
187+
- /patch_release.*/
188188
tags:
189189
ignore: /.*/
190-
191-
- publish_tag:
192-
requires:
193-
- test_7
194-
- test_8
195-
- test_9
196-
filters:
197-
branches:
198-
ignore: /.*/
199-
tags:
200-
only: /^v.*/

gradle/publish.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ if (!isRoot) {
6363
}
6464

6565
def isSnapshot = version.endsWith("-SNAPSHOT")
66-
def isCIandTagged = System.getenv("CIRCLE_TAG") != null
6766
// define in ~/.gradle/gradle.properties to override for testing
6867
def forceLocal = project.hasProperty('forceLocal') && forceLocal
6968

@@ -152,6 +151,6 @@ bintray {
152151
}
153152
}
154153

155-
if (!isSnapshot && isCIandTagged) {
154+
if (!isSnapshot) {
156155
artifactoryPublish.finalizedBy bintrayUpload
157156
}

0 commit comments

Comments
 (0)