From 415476cef91dbf91ec57d6475c1904ae0ca62ebf Mon Sep 17 00:00:00 2001 From: HypherionSA Date: Tue, 17 Jun 2025 22:18:14 +0200 Subject: [PATCH] Fix the damn buildscripts I keep on missing --- 1.21.6/.jenkins/Jenkinsfile.deploy | 20 +++-- 1.21.6/.jenkins/Jenkinsfile.snapshot | 42 +++++----- 1.21.6/changelog.md | 2 +- .../1.21.6/.jenkins/Jenkinsfile.deploy.patch | 42 ++++++++++ .../.jenkins/Jenkinsfile.snapshot.patch | 76 ++++++++++++++++--- 5 files changed, 147 insertions(+), 35 deletions(-) create mode 100644 patches/1.21.6/.jenkins/Jenkinsfile.deploy.patch diff --git a/1.21.6/.jenkins/Jenkinsfile.deploy b/1.21.6/.jenkins/Jenkinsfile.deploy index 017618b..b00137e 100644 --- a/1.21.6/.jenkins/Jenkinsfile.deploy +++ b/1.21.6/.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.21.6/.jenkins/Jenkinsfile.snapshot b/1.21.6/.jenkins/Jenkinsfile.snapshot index b1d35b0..9d30e3a 100644 --- a/1.21.6/.jenkins/Jenkinsfile.snapshot +++ b/1.21.6/.jenkins/Jenkinsfile.snapshot @@ -4,7 +4,7 @@ def JDK = "21"; def majorMc = "1.21.6"; def modLoaders = "neoforge|fabric|quilt|paper"; def supportedMc = "1.21.6"; -def reltype = "experimental"; +def reltype = "snapshot"; pipeline { agent { @@ -38,15 +38,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}" + } } } } @@ -54,21 +58,23 @@ pipeline { post { always { - sh "./gradlew --stop" - archiveArtifacts artifacts: 'artifacts/*.jar' + 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}", - type: "snapshot", - dependsOn: "", - 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}", + type: "snapshot", + dependsOn: "", + failWebhook: env.SSS_WEBHOOK, + publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" - deleteDir() + deleteDir() + } } } } diff --git a/1.21.6/changelog.md b/1.21.6/changelog.md index 24a37cc..4cab28c 100644 --- a/1.21.6/changelog.md +++ b/1.21.6/changelog.md @@ -1 +1 @@ -Port for 1.21.6 \ No newline at end of file +Port for 1.21.6 diff --git a/patches/1.21.6/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21.6/.jenkins/Jenkinsfile.deploy.patch new file mode 100644 index 0000000..1857ad5 --- /dev/null +++ b/patches/1.21.6/.jenkins/Jenkinsfile.deploy.patch @@ -0,0 +1,42 @@ +--- a/.jenkins/Jenkinsfile.deploy ++++ b/.jenkins/Jenkinsfile.deploy +@@ -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.21.6/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.6/.jenkins/Jenkinsfile.snapshot.patch index afc0eac..40cad5f 100644 --- a/patches/1.21.6/.jenkins/Jenkinsfile.snapshot.patch +++ b/patches/1.21.6/.jenkins/Jenkinsfile.snapshot.patch @@ -1,20 +1,76 @@ --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot -@@ -3,7 +3,7 @@ +@@ -3,8 +3,8 @@ def JDK = "21"; def majorMc = "1.21.6"; def modLoaders = "neoforge|fabric|quilt|paper"; -def supportedMc = "25w19a"; +-def reltype = "experimental"; +def supportedMc = "1.21.6"; - def reltype = "experimental"; ++def reltype = "snapshot"; pipeline { -@@ -63,7 +63,7 @@ - projectIcon: "${projectIcon}", - modLoaders: "${modLoaders}", - minecraftVersions: "${supportedMc}", + agent { +@@ -38,15 +38,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}" ++ } + } + } + } +@@ -54,21 +58,23 @@ + + post { + always { +- sh "./gradlew --stop" +- archiveArtifacts artifacts: 'artifacts/*.jar' +- +- fddsnapshotter apiKey: env.PLATFORM_KEY, +- projectSlug: "craterlib", +- projectName: "${projectName}", +- projectIcon: "${projectIcon}", +- modLoaders: "${modLoaders}", +- minecraftVersions: "${supportedMc}", - type: "experimental", -+ type: "snapshot", - dependsOn: "", - failWebhook: env.SSS_WEBHOOK, - publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" +- dependsOn: "", +- 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}", ++ type: "snapshot", ++ dependsOn: "", ++ failWebhook: env.SSS_WEBHOOK, ++ publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" ++ ++ deleteDir() ++ } + } + } + }