Skip to content

Commit 824c03b

Browse files
Tweak github release deployment:
- Fail if we attempt to upload a tagged release twice - Delete existing snapshots before recreating them - Create snapshots as non-draft - Create releases as draft - Skip entire build for SNAPSHOT tags
1 parent c4cf60b commit 824c03b

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.circleci/config.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
alltags: &alltags
44
filters:
55
tags:
6-
only: /.*/
6+
only: /((?!SNAPSHOT).)*/
77
restoremavencache: &restoremavencache
88
keys:
99
- maven-repo-v3-{{ .Branch }}-{{ checksum "pom.xml" }}
@@ -46,7 +46,7 @@ workflows:
4646
- "End-to-end tests"
4747
filters:
4848
tags:
49-
only: /^.*\..*/
49+
only: /^.*\.((?!SNAPSHOT).)*/
5050
branches:
5151
only:
5252
- master
@@ -58,7 +58,7 @@ workflows:
5858
- "End-to-end tests"
5959
filters:
6060
tags:
61-
only: /^.*\..*/
61+
only: /^.*\.((?!SNAPSHOT).)*/
6262
branches:
6363
only:
6464
- master
@@ -282,16 +282,23 @@ jobs:
282282
cd orko-app
283283
if [[ -n "$CIRCLE_TAG" ]]; then
284284
mvn ${BUILD_ARGS} github-release:release \
285-
--settings ../etc/.maven-settings.xml
285+
--settings ../etc/.maven-settings.xml \
286+
-Dgithub.commitish=$CIRCLE_SHA1 \
287+
-Dgithub.draft=true \
288+
-Dgithub.failOnExistingRelease=true \
289+
-Dgithub.deleteRelease=false
286290
else
287291
if [[ (-z "$CIRCLE_BRANCH") || ("$CIRCLE_BRANCH" == "master") ]]; then
288292
COMMIT_MESSAGE=`git log --format=%B -n 1 $CIRCLE_SHA1`
289293
if [[ $COMMIT_MESSAGE != *"prepare release"* ]]; then
290294
mvn ${BUILD_ARGS} github-release:release \
291295
--settings ../etc/.maven-settings.xml \
292-
-Dgithub.draft=true
296+
-Dgithub.commitish=$CIRCLE_SHA1 \
297+
-Dgithub.draft=false \
298+
-Dgithub.failOnExistingRelease=false \
299+
-Dgithub.deleteRelease=true
293300
else
294-
echo "No [publish snapshot] in commit message"
301+
echo "Skipping pushing snapshot during a release"
295302
fi
296303
else
297304
echo "Not a tag or master branch"

orko-app/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@
231231
<releaseName>${project.version}</releaseName>
232232
<repositoryId>gruelbox/orko</repositoryId>
233233
<tag>${project.version}</tag>
234+
<failOnExistingRelease>${github.failOnExistingRelease}</failOnExistingRelease>
235+
<deleteRelease>${github.deleteRelease}</deleteRelease>
234236
<fileSets>
235237
<fileSet>
236238
<directory>${project.basedir}</directory>

0 commit comments

Comments
 (0)