From fe00eabdff2d5fff1538668afb710cee7dca4025 Mon Sep 17 00:00:00 2001
From: hypherionmc <hypherionmc@gmail.com>
Date: Tue, 25 Mar 2025 20:52:02 +0200
Subject: [PATCH] [ci skip] Fix Jenkins Config for 1.21.5

---
 1.21.5/.jenkins/Jenkinsfile.deploy            | 20 +++--
 1.21.5/.jenkins/Jenkinsfile.snapshot          | 44 ++++++-----
 1.21.5/Fabric/build.gradle                    |  2 +-
 1.21.5/NeoForge/build.gradle                  |  2 +-
 1.21.5/Paper/build.gradle                     |  2 +-
 .../1.21.5/.jenkins/Jenkinsfile.deploy.patch  | 42 ++++++++++
 .../.jenkins/Jenkinsfile.snapshot.patch       | 76 ++++++++++++++++---
 7 files changed, 150 insertions(+), 38 deletions(-)
 create mode 100644 patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch

diff --git a/1.21.5/.jenkins/Jenkinsfile.deploy b/1.21.5/.jenkins/Jenkinsfile.deploy
index cd9b9d8..63f7ac4 100644
--- a/1.21.5/.jenkins/Jenkinsfile.deploy
+++ b/1.21.5/.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.5/.jenkins/Jenkinsfile.snapshot b/1.21.5/.jenkins/Jenkinsfile.snapshot
index ac8e372..0745398 100644
--- a/1.21.5/.jenkins/Jenkinsfile.snapshot
+++ b/1.21.5/.jenkins/Jenkinsfile.snapshot
@@ -4,7 +4,7 @@ def JDK = "21";
 def majorMc = "1.21.5";
 def modLoaders = "neoforge|fabric|quilt|paper";
 def supportedMc = "1.21.5";
-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()
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/1.21.5/Fabric/build.gradle b/1.21.5/Fabric/build.gradle
index 6f96e6d..6bf3914 100644
--- a/1.21.5/Fabric/build.gradle
+++ b/1.21.5/Fabric/build.gradle
@@ -133,4 +133,4 @@ publisher {
         required("fabric-api")
         optional("cloth-config", "modmenu")
     }
-}
\ No newline at end of file
+}
diff --git a/1.21.5/NeoForge/build.gradle b/1.21.5/NeoForge/build.gradle
index a8bb3b1..fc0ee80 100644
--- a/1.21.5/NeoForge/build.gradle
+++ b/1.21.5/NeoForge/build.gradle
@@ -132,4 +132,4 @@ publisher {
     modrinthDepends {
         optional("cloth-config")
     }
-}
\ No newline at end of file
+}
diff --git a/1.21.5/Paper/build.gradle b/1.21.5/Paper/build.gradle
index 434c1d1..28fac94 100644
--- a/1.21.5/Paper/build.gradle
+++ b/1.21.5/Paper/build.gradle
@@ -75,4 +75,4 @@ publisher {
 }
 
 publishModrinth.dependsOn(reobfJar)
-publishNightbloom.dependsOn(reobfJar)
\ No newline at end of file
+publishNightbloom.dependsOn(reobfJar)
diff --git a/patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch b/patches/1.21.5/.jenkins/Jenkinsfile.deploy.patch
new file mode 100644
index 0000000..1857ad5
--- /dev/null
+++ b/patches/1.21.5/.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.5/.jenkins/Jenkinsfile.snapshot.patch b/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch
index be38c02..720bff5 100644
--- a/patches/1.21.5/.jenkins/Jenkinsfile.snapshot.patch
+++ b/patches/1.21.5/.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.5";
  def modLoaders = "neoforge|fabric|quilt|paper";
 -def supportedMc = "1.21.5-rc1";
+-def reltype = "experimental";
 +def supportedMc = "1.21.5";
- 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()
++            }
+         }
+     }
+ }