diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy index c971fbe..5673ccd 100644 --- a/.jenkins/Jenkinsfile.deploy +++ b/.jenkins/Jenkinsfile.deploy @@ -18,24 +18,32 @@ pipeline { } stage("Prepare") { steps { - sh "chmod +x ./dev/gradlew" - sh "./dev/gradlew clean" + sh "chmod +x ./gradlew" + sh "./gradlew cleanWorkspace" + sh "./gradlew setupWorkspace" } } stage("Publish to Modrinth/Curseforge") { steps { - sh "./dev/gradlew publishMod -Prelease=true" + dir('dev') { + sh "chmod +x ./gradlew" + sh "./gradlew publishMod -Prelease=true" + } } } stage("Publish to Maven") { steps { - sh "./dev/gradlew publish -Prelease=true" + dir('dev') { + sh "./gradlew publish -Prelease=true" + } } } } post { always { - sh "./dev/gradlew --stop" + dir('dev') { + sh "./gradlew --stop" + } deleteDir() discordSend webhookURL: env.FDD_WH_ADMIN, diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot index 4724028..b4397ce 100644 --- a/.jenkins/Jenkinsfile.snapshot +++ b/.jenkins/Jenkinsfile.snapshot @@ -22,21 +22,28 @@ pipeline { stage("Prepare") { steps { - sh "chmod +x ./dev/gradlew" - sh "./dev/gradlew clean" + sh "chmod +x ./gradlew" + sh "./gradlew cleanWorkspace" + sh "./gradlew setupWorkspace" } } stage("Build") { steps { - sh "./dev/gradlew build" + dir('dev') { + sh "chmod +x ./gradlew" + sh "./gradlew clean" + sh "./gradlew build" + } } } stage("Publish to Maven") { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "./dev/gradlew publish" + dir('dev') { + sh "./gradlew publish" + } } } } @@ -44,8 +51,9 @@ pipeline { post { always { - sh "./dev/gradlew --stop" - archiveArtifacts artifacts: 'dev/artifacts/*.jar' + dir('dev') { + sh "./gradlew --stop" + archiveArtifacts artifacts: 'artifacts/*.jar' fddsnapshotter apiKey: env.PLATFORM_KEY, projectSlug: "craterlib", @@ -56,6 +64,7 @@ pipeline { failWebhook: env.SSS_WEBHOOK, publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" + } deleteDir() } } diff --git a/build.gradle b/build.gradle index edcfa2d..c22e059 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "com.hypherionmc.modutils.orion" version "1.0.+" + id "com.hypherionmc.modutils.orion" version "1.0.13" } orionporting { diff --git a/commit.sha b/commit.sha index 50d41df..6debf56 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -97d8eaa5e8b37fb291f6e5731a4659d4749dee0b \ No newline at end of file +7bbbd7be62884a1f37aaf13f2d994b047ccac32a \ No newline at end of file