diff --git a/Jenkinsfile b/Jenkinsfile index 14533ac21..5c3715bb3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { archiveArtifacts 'proxy/build/libs/*-all.jar,api/build/libs/*-all.jar' } } - stage('Deploy Artifacts') { + stage('Deploy') { when { expression { GIT_BRANCH = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim() @@ -23,27 +23,11 @@ pipeline { agent { docker { image 'velocitypowered/openjdk8-plus-git:slim' - args '-v maven-repo:/maven-repo:rw' + args '-v gradle-cache:/root/.gradle:rw -v maven-repo:/maven-repo:rw -v javadoc:/javadoc:rw' } } steps { sh 'export MAVEN_DEPLOYMENT=true; ./gradlew publish' - } - } - stage('Deploy Javadoc') { - when { - expression { - GIT_BRANCH = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim() - return GIT_BRANCH == 'master' - } - } - agent { - docker { - image 'velocitypowered/openjdk8-plus-git:slim' - args '-v javadoc:/javadoc:rw' - } - } - steps { sh 'rsync -av --delete ./api/build/docs/javadoc/ /javadoc' } }