From 6e5d6e3a179bd799f7d4c097b6faa81349faf301 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Tue, 11 Jun 2024 23:04:13 +0200 Subject: [PATCH] Hopefully this will work now? --- 1.18.2/.jenkins/Jenkinsfile.deploy | 20 ++++-- 1.18.2/.jenkins/Jenkinsfile.snapshot | 35 ++++++----- 1.19.2/.jenkins/Jenkinsfile.deploy | 22 ++++--- 1.19.2/.jenkins/Jenkinsfile.snapshot | 35 ++++++----- 1.19.3/.jenkins/Jenkinsfile.deploy | 22 ++++--- 1.19.3/.jenkins/Jenkinsfile.snapshot | 39 +++++++----- 1.20.2/.jenkins/Jenkinsfile.deploy | 20 ++++-- 1.20.2/.jenkins/Jenkinsfile.snapshot | 35 ++++++----- 1.20.4/.jenkins/Jenkinsfile.deploy | 20 ++++-- 1.20.4/.jenkins/Jenkinsfile.snapshot | 35 ++++++----- 1.20/.jenkins/Jenkinsfile.deploy | 20 ++++-- 1.20/.jenkins/Jenkinsfile.snapshot | 37 ++++++----- commit.sha | 2 +- .../1.18.2/.jenkins/Jenkinsfile.deploy.patch | 40 ++++++++++++ .../.jenkins/Jenkinsfile.snapshot.patch | 59 ++++++++++++++++++ .../1.19.2/.jenkins/Jenkinsfile.deploy.patch | 40 ++++++++++++ .../.jenkins/Jenkinsfile.snapshot.patch | 59 ++++++++++++++++++ .../1.19.3/.jenkins/Jenkinsfile.deploy.patch | 42 ++++++++++++- .../.jenkins/Jenkinsfile.snapshot.patch | 61 ++++++++++++++++++- .../1.20.2/.jenkins/Jenkinsfile.deploy.patch | 40 ++++++++++++ .../.jenkins/Jenkinsfile.snapshot.patch | 59 ++++++++++++++++++ .../1.20.4/.jenkins/Jenkinsfile.deploy.patch | 40 ++++++++++++ .../.jenkins/Jenkinsfile.snapshot.patch | 59 ++++++++++++++++++ .../1.20/.jenkins/Jenkinsfile.deploy.patch | 40 ++++++++++++ .../1.20/.jenkins/Jenkinsfile.snapshot.patch | 61 ++++++++++++++++++- 25 files changed, 813 insertions(+), 129 deletions(-) diff --git a/1.18.2/.jenkins/Jenkinsfile.deploy b/1.18.2/.jenkins/Jenkinsfile.deploy index 470c95c..fd7cd45 100644 --- a/1.18.2/.jenkins/Jenkinsfile.deploy +++ b/1.18.2/.jenkins/Jenkinsfile.deploy @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/1.18.2/.jenkins/Jenkinsfile.snapshot b/1.18.2/.jenkins/Jenkinsfile.snapshot index 0de2c9b..4212c76 100644 --- a/1.18.2/.jenkins/Jenkinsfile.snapshot +++ b/1.18.2/.jenkins/Jenkinsfile.snapshot @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/1.19.2/.jenkins/Jenkinsfile.deploy b/1.19.2/.jenkins/Jenkinsfile.deploy index 7cb1612..6218147 100644 --- a/1.19.2/.jenkins/Jenkinsfile.deploy +++ b/1.19.2/.jenkins/Jenkinsfile.deploy @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", @@ -53,4 +61,4 @@ pipeline { description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}" } } -} +} \ No newline at end of file diff --git a/1.19.2/.jenkins/Jenkinsfile.snapshot b/1.19.2/.jenkins/Jenkinsfile.snapshot index ded5eca..a057cdd 100644 --- a/1.19.2/.jenkins/Jenkinsfile.snapshot +++ b/1.19.2/.jenkins/Jenkinsfile.snapshot @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/1.19.3/.jenkins/Jenkinsfile.deploy b/1.19.3/.jenkins/Jenkinsfile.deploy index 8aaecc3..a559715 100644 --- a/1.19.3/.jenkins/Jenkinsfile.deploy +++ b/1.19.3/.jenkins/Jenkinsfile.deploy @@ -1,4 +1,4 @@ -def majorMc = "1.19.3/4"; +def majorMc = "1.19.3"; def JDK = "17" pipeline { @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/1.19.3/.jenkins/Jenkinsfile.snapshot b/1.19.3/.jenkins/Jenkinsfile.snapshot index e5e2d2e..543e512 100644 --- a/1.19.3/.jenkins/Jenkinsfile.snapshot +++ b/1.19.3/.jenkins/Jenkinsfile.snapshot @@ -1,7 +1,7 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def JDK = "17"; -def majorMc = "1.19.3/4"; +def majorMc = "1.19.3"; def modLoaders = "forge|fabric|quilt"; def supportedMc = "1.19.3|1.19.4"; def reltype = "snapshot"; @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } -} +} \ No newline at end of file diff --git a/1.20.2/.jenkins/Jenkinsfile.deploy b/1.20.2/.jenkins/Jenkinsfile.deploy index 88127b6..614570e 100644 --- a/1.20.2/.jenkins/Jenkinsfile.deploy +++ b/1.20.2/.jenkins/Jenkinsfile.deploy @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/1.20.2/.jenkins/Jenkinsfile.snapshot b/1.20.2/.jenkins/Jenkinsfile.snapshot index d629b33..41098ce 100644 --- a/1.20.2/.jenkins/Jenkinsfile.snapshot +++ b/1.20.2/.jenkins/Jenkinsfile.snapshot @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/1.20.4/.jenkins/Jenkinsfile.deploy b/1.20.4/.jenkins/Jenkinsfile.deploy index c9013a4..7cd0a2b 100644 --- a/1.20.4/.jenkins/Jenkinsfile.deploy +++ b/1.20.4/.jenkins/Jenkinsfile.deploy @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/1.20.4/.jenkins/Jenkinsfile.snapshot b/1.20.4/.jenkins/Jenkinsfile.snapshot index 8d98591..4a34ccd 100644 --- a/1.20.4/.jenkins/Jenkinsfile.snapshot +++ b/1.20.4/.jenkins/Jenkinsfile.snapshot @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/1.20/.jenkins/Jenkinsfile.deploy b/1.20/.jenkins/Jenkinsfile.deploy index fef4ba8..d86af74 100644 --- a/1.20/.jenkins/Jenkinsfile.deploy +++ b/1.20/.jenkins/Jenkinsfile.deploy @@ -26,25 +26,33 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew clean" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + } } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./gradlew publishMod -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./gradlew publish -Prelease=true" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./gradlew --stop" - deleteDir() + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + deleteDir() + } discordSend webhookURL: env.FDD_WH_ADMIN, title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/1.20/.jenkins/Jenkinsfile.snapshot b/1.20/.jenkins/Jenkinsfile.snapshot index a1b5870..a3b975f 100644 --- a/1.20/.jenkins/Jenkinsfile.snapshot +++ b/1.20/.jenkins/Jenkinsfile.snapshot @@ -1,7 +1,7 @@ def projectName = "CraterLib"; def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png"; def JDK = "17"; -def majorMc = "1.20/1"; +def majorMc = "1.20"; def modLoaders = "forge|fabric|quilt"; def supportedMc = "1.20|1.20.1"; def reltype = "snapshot"; @@ -32,15 +32,19 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./gradlew" - sh "./gradlew build -PreleaseType=${reltype}" + dir("${WORKSPACE}/${majorMc}") { + sh "chmod +x ./gradlew" + sh "./gradlew build -PreleaseType=${reltype}" + } } } stage("Publish to Maven") { steps { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./gradlew publish -PreleaseType=${reltype}" + dir ("${WORKSPACE}/${majorMc}") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "./gradlew publish -PreleaseType=${reltype}" + } } } } @@ -48,18 +52,21 @@ pipeline { post { always { - sh "./gradlew --stop" + dir("${WORKSPACE}/${majorMc}") { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' - fddsnapshotter apiKey: env.PLATFORM_KEY, - projectSlug: "craterlib", - projectName: "${projectName}", - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + fddsnapshotter apiKey: env.PLATFORM_KEY, + projectSlug: "craterlib", + projectName: "${projectName}", + projectIcon: "${projectIcon}", + modLoaders: "${modLoaders}", + minecraftVersions: "${supportedMc}", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/commit.sha b/commit.sha index d7ccfca..5298e4e 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -dd69ecd7cc75cc91bf2bab79fb8d3d473b43f268 \ No newline at end of file +6b05af6c83d8766cad3894ab322fef69c3152bea \ No newline at end of file diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch index 79ae1dc..b3bd51d 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.deploy.patch @@ -8,3 +8,43 @@ pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch index 87926d6..6014764 100644 --- a/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.18.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,3 +16,62 @@ pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + } diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch index c757fd3..107078d 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.deploy.patch @@ -8,3 +8,43 @@ pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch index 2e0dc64..8701254 100644 --- a/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,3 +16,62 @@ pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + } diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch index 2c05bbc..69cd139 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.deploy.patch @@ -3,8 +3,48 @@ @@ -1,5 +1,5 @@ -def JDK = "21" -def majorMc = "1.21"; -+def majorMc = "1.19.3/4"; ++def majorMc = "1.19.3"; +def JDK = "17" pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch index 7789450..548e1fc 100644 --- a/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch @@ -9,10 +9,69 @@ -def supportedMc = "1.21"; -def reltype = "port"; +def JDK = "17"; -+def majorMc = "1.19.3/4"; ++def majorMc = "1.19.3"; +def modLoaders = "forge|fabric|quilt"; +def supportedMc = "1.19.3|1.19.4"; +def reltype = "snapshot"; pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + } diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch index 5943308..8945b6a 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.deploy.patch @@ -8,3 +8,43 @@ pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch index 6f33f6c..8c0e52d 100644 --- a/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.2/.jenkins/Jenkinsfile.snapshot.patch @@ -16,3 +16,62 @@ pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + } diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch index 2341c8c..f7722b7 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.deploy.patch @@ -8,3 +8,43 @@ pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch index 0da081a..3b43aaa 100644 --- a/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20.4/.jenkins/Jenkinsfile.snapshot.patch @@ -16,3 +16,62 @@ pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + } diff --git a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch index ab2d1dd..4b44148 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.deploy.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.deploy.patch @@ -8,3 +8,43 @@ pipeline { agent { +@@ -26,25 +26,33 @@ + } + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew clean" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew clean" ++ } + } + } + stage("Publish to Modrinth/Curseforge") { + steps { +- sh "./gradlew publishMod -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publishMod -Prelease=true" ++ } + } + } + stage("Publish to Maven") { + steps { +- sh "./gradlew publish -Prelease=true" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew publish -Prelease=true" ++ } + } + } + } + post { + always { +- sh "./gradlew --stop" +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ deleteDir() ++ } + + discordSend webhookURL: env.FDD_WH_ADMIN, + title: "CraterLib Port Deploy #${BUILD_NUMBER}", diff --git a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch index 9f39130..4cab9e3 100644 --- a/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.20/.jenkins/Jenkinsfile.snapshot.patch @@ -9,10 +9,69 @@ -def supportedMc = "1.21"; -def reltype = "port"; +def JDK = "17"; -+def majorMc = "1.20/1"; ++def majorMc = "1.20"; +def modLoaders = "forge|fabric|quilt"; +def supportedMc = "1.20|1.20.1"; +def reltype = "snapshot"; pipeline { agent { +@@ -32,15 +32,19 @@ + + stage("Prepare") { + steps { +- sh "chmod +x ./gradlew" +- sh "./gradlew build -PreleaseType=${reltype}" ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "chmod +x ./gradlew" ++ sh "./gradlew build -PreleaseType=${reltype}" ++ } + } + } + + stage("Publish to Maven") { + steps { +- catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { +- sh "./gradlew publish -PreleaseType=${reltype}" ++ dir ("${WORKSPACE}/${majorMc}") { ++ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { ++ sh "./gradlew publish -PreleaseType=${reltype}" ++ } + } + } + } +@@ -48,19 +52,21 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", +- failWebhook: env.SSS_WEBHOOK, +- publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- +- deleteDir() ++ dir("${WORKSPACE}/${majorMc}") { ++ sh "./gradlew --stop" ++ archiveArtifacts artifacts: 'artifacts/*.jar' ++ ++ fddsnapshotter apiKey: env.PLATFORM_KEY, ++ projectSlug: "craterlib", ++ projectName: "${projectName}", ++ projectIcon: "${projectIcon}", ++ modLoaders: "${modLoaders}", ++ minecraftVersions: "${supportedMc}", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + }