[DEV] Fix up porting patches and configs
This commit is contained in:
@@ -1,15 +1,12 @@
|
||||
--- a/.jenkins/Jenkinsfile.deploy
|
||||
+++ b/.jenkins/Jenkinsfile.deploy
|
||||
@@ -1,7 +1,7 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
-def JDK = "21"
|
||||
+def JDK = "17"
|
||||
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
args '-v gradle-cache:/home/gradle/.gradle'
|
||||
}
|
||||
@@ -15,7 +15,7 @@
|
||||
@@ -17,7 +17,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
@@ -18,12 +15,3 @@
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -44,7 +44,7 @@
|
||||
deleteDir()
|
||||
|
||||
discordSend webhookURL: env.FDD_WH_ADMIN,
|
||||
- title: "CraterLib Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "CraterLib 1.18.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: currentBuild.currentResult,
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"
|
||||
|
@@ -1,52 +1,18 @@
|
||||
--- a/.jenkins/Jenkinsfile.snapshot
|
||||
+++ b/.jenkins/Jenkinsfile.snapshot
|
||||
@@ -1,10 +1,11 @@
|
||||
@@ -1,10 +1,10 @@
|
||||
def projectName = "CraterLib";
|
||||
def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
|
||||
+def relType = "snapshot"
|
||||
-def JDK = "21";
|
||||
-def majorMc = "Port";
|
||||
-def modLoaders = "neoforge|fabric|quilt";
|
||||
-def supportedMc = "1.21";
|
||||
-def reltype = "port";
|
||||
+def JDK = "17";
|
||||
+def majorMc = "1.18.2";
|
||||
+def modLoaders = "forge|fabric|quilt";
|
||||
+def supportedMc = "1.18.2";
|
||||
+def reltype = "snapshot";
|
||||
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
- image "registry.firstdark.dev/java21:latest"
|
||||
+ image "registry.firstdark.dev/java17:latest"
|
||||
alwaysPull true
|
||||
args '-v gradle-cache:/home/gradle/.gradle'
|
||||
}
|
||||
@@ -18,7 +19,7 @@
|
||||
stage("Notify Discord") {
|
||||
steps {
|
||||
discordSend webhookURL: env.SSS_WEBHOOK,
|
||||
- title: "Deploy Started: ${projectName} Port Deploy #${BUILD_NUMBER}",
|
||||
+ title: "Deploy Started: ${projectName} 1.18.2 Deploy #${BUILD_NUMBER}",
|
||||
link: env.BUILD_URL,
|
||||
result: 'SUCCESS',
|
||||
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
|
||||
@@ -34,14 +35,14 @@
|
||||
|
||||
stage("Build") {
|
||||
steps {
|
||||
- sh "./gradlew build -PreleaseType=port"
|
||||
+ sh "./gradlew build -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
|
||||
stage("Publish to Maven") {
|
||||
steps {
|
||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||
- sh "./gradlew publish -PreleaseType=port"
|
||||
+ sh "./gradlew publish -PreleaseType=${relType}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -56,8 +57,8 @@
|
||||
projectSlug: "craterlib",
|
||||
projectName: "${projectName}",
|
||||
projectIcon: "${projectIcon}",
|
||||
- modLoaders: "neoforge|fabric|quilt",
|
||||
- minecraftVersions: "1.21",
|
||||
+ modLoaders: "forge|fabric|quilt",
|
||||
+ minecraftVersions: "1.18.2",
|
||||
failWebhook: env.SSS_WEBHOOK,
|
||||
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
|
||||
|
||||
|
Reference in New Issue
Block a user