From 6ba1863846e2f65c34327c3e5a201fd84f8e5021 Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Fri, 19 Jul 2019 11:53:02 -0500 Subject: [PATCH] DATAJDBC-376 - Publish documentation for main branch. --- Jenkinsfile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 294f3af3..54618e95 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,8 +39,10 @@ pipeline { } stage('Release to artifactory') { when { - branch 'issue/*' - not { triggeredBy 'UpstreamCause' } + anyOf { + branch 'master' + not { triggeredBy 'UpstreamCause' } + } } agent { docker { @@ -67,7 +69,7 @@ pipeline { '-Dmaven.test.skip=true clean deploy -B' } } - stage('Release to artifactory with docs') { + stage('Publish documentation') { when { branch 'master' } @@ -85,14 +87,11 @@ pipeline { } steps { - sh 'rm -rf ?' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' + + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' + '-Dartifactory.server=https://repo.spring.io ' + "-Dartifactory.username=${ARTIFACTORY_USR} " + "-Dartifactory.password=${ARTIFACTORY_PSW} " + - "-Dartifactory.staging-repository=libs-snapshot-local " + - "-Dartifactory.build-name=spring-data-jdbc " + - "-Dartifactory.build-number=${BUILD_NUMBER} " + + "-Dartifactory.distribution-repository=temp-private-local " + '-Dmaven.test.skip=true clean deploy -B' } }