diff --git a/Jenkinsfile b/Jenkinsfile index 15d00ba..bcf006f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,21 +1,7 @@ pipeline { agent any stages { - stage("integrate modpack") { - when { - branch '**/sync-modpack' - } - steps { - sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) { - sh "git fetch" - sh "git checkout origin/develop" - sh "git merge -X theirs origin/sync-modpack" - sh "chmod u+x ./scripts/*.sh" - sh "./scripts/update_modpack.sh" - } - } - } - stage("server launch") { + stage("server trial") { when { not { branch '**/sync-modpack' @@ -32,22 +18,6 @@ pipeline { sh "rm mods/DynmapBlockScan.jar" } } - stage("commit changes") { - when { - branch '**/sync-modpack' - } - steps { - sh "git add mods/**" - sh "git add config/**" - sh "git add dynmap/renderdata/**" - sh "git clean -dfX" - sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'" - sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { - sh "git pull -X theirs origin develop" - sh returnStatus: true, script: "git push --set-upstream origin develop" - } - } - } stage("deploy") { when { branch '**/master'