Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert changes (well that didn't work)

This commit is contained in:
Simon Gardling 2021-04-06 22:47:52 -04:00
parent 5e3f7d43c0
commit 803b6a4dce
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -51,7 +51,6 @@ pipeline {
) { ) {
withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-deploy', usernameVariable: 'ORG_GRADLE_PROJECT_mavenUsername', passwordVariable: 'ORG_GRADLE_PROJECT_mavenPassword')]) {
sh ''' sh '''
chmod +x mvn || true
./gradlew clean build paperclip publish ./gradlew clean build paperclip publish
mkdir -p "./target" mkdir -p "./target"
basedir=$(pwd) basedir=$(pwd)

5
buildSrc/src/main/kotlin/task/Paperclip.kt
View File

@ -28,10 +28,7 @@ internal fun Project.createPaperclipTask(
"-Dvanillajar=$vanillaJarPath" "-Dvanillajar=$vanillaJarPath"
) )
if (System.getProperty("os.name").startsWith("Windows")) paperclipCmd[0] = "mvn.cmd" if (System.getProperty("os.name").startsWith("Windows")) paperclipCmd[0] = "mvn.cmd"
if (jenkins) { if (jenkins) paperclipCmd.add("-Dstyle.color=never")
paperclipCmd.add("-Dstyle.color=never")
paperclipCmd[0] = "./mvn"
}
ensureSuccess(cmd(*paperclipCmd.toTypedArray(), dir = paperclipDir, printOut = true)) ensureSuccess(cmd(*paperclipCmd.toTypedArray(), dir = paperclipDir, printOut = true))
val paperClip = paperclipDir.resolve("assembly/target/paperclip-${toothpick.minecraftVersion}.jar") val paperClip = paperclipDir.resolve("assembly/target/paperclip-${toothpick.minecraftVersion}.jar")
val destination = rootProjectDir.resolve(toothpick.calcPaperclipName) val destination = rootProjectDir.resolve(toothpick.calcPaperclipName)