Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-28 21:56:37 +01:00
Code Issues Projects Releases Wiki Activity

maven test 3

Browse Source
This commit is contained in:
Simon Gardling 2021-04-06 22:39:35 -04:00
parent f564431f5a
commit 5e3f7d43c0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -33,7 +33,6 @@ pipeline {
publisherStrategy: 'EXPLICIT', publisherStrategy: 'EXPLICIT',
) { ) {
sh ''' sh '''
whereis mvn && exit
./gradlew setupUpstream ./gradlew setupUpstream
./gradlew applyPatches ./gradlew applyPatches
''' '''
@ -52,6 +51,7 @@ 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,7 +28,10 @@ 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) paperclipCmd.add("-Dstyle.color=never") if (jenkins) {
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)