From 803b6a4dce0dd636a57de11a65a67f8cac86741a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 6 Apr 2021 22:47:52 -0400 Subject: [PATCH] revert changes (well that didn't work) --- Jenkinsfile | 1 - buildSrc/src/main/kotlin/task/Paperclip.kt | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aa12c411..cd91b073 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,6 @@ pipeline { ) { withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) { sh ''' - chmod +x mvn || true ./gradlew clean build paperclip publish mkdir -p "./target" basedir=$(pwd) diff --git a/buildSrc/src/main/kotlin/task/Paperclip.kt b/buildSrc/src/main/kotlin/task/Paperclip.kt index 44c16b09..a9f82332 100644 --- a/buildSrc/src/main/kotlin/task/Paperclip.kt +++ b/buildSrc/src/main/kotlin/task/Paperclip.kt @@ -28,10 +28,7 @@ internal fun Project.createPaperclipTask( "-Dvanillajar=$vanillaJarPath" ) if (System.getProperty("os.name").startsWith("Windows")) paperclipCmd[0] = "mvn.cmd" - if (jenkins) { - paperclipCmd.add("-Dstyle.color=never") - paperclipCmd[0] = "./mvn" - } + if (jenkins) paperclipCmd.add("-Dstyle.color=never") ensureSuccess(cmd(*paperclipCmd.toTypedArray(), dir = paperclipDir, printOut = true)) val paperClip = paperclipDir.resolve("assembly/target/paperclip-${toothpick.minecraftVersion}.jar") val destination = rootProjectDir.resolve(toothpick.calcPaperclipName)