From b894dfbdd470ebdfc17a422ee5a6f10dca2113b0 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Fri, 21 Sep 2018 12:44:17 -0400
Subject: [PATCH] Combine the javadoc and publish stages together

In other words, the security-sensitive stuff now runs on its own agent.
---
 Jenkinsfile | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

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'
       }
     }