diff --git a/Jenkinsfile b/Jenkinsfile index 7131b66..77480a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,13 +3,13 @@ pipeline { stages { stage("integrate modpack") { when { - branch '**/develop' + branch '**/sync-modpack' } steps { sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) { sh "git fetch" - sh "git checkout -B latest-modpack" - sh "git merge -X theirs origin/develop" + sh "git checkout -B origin/develop" + sh "git merge -X theirs origin/sync-modpack" sh "chmod u+x ./scripts/*.sh" sh "./scripts/update_modpack.sh" } @@ -18,7 +18,7 @@ pipeline { stage("server launch test") { when { not { - branch '**/latest-modpack' + branch '**/sync-modpack' } } steps { @@ -32,7 +32,7 @@ pipeline { } stage("commit changes") { when { - branch '**/develop' + branch '**/sync-modpack' } steps { sh "git clean -dfX" @@ -40,8 +40,8 @@ pipeline { sh "git add config/**" sh "git commit -a -m 'Automatic integration of latest modpack.' && exit 0" sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { - sh "git pull -X theirs origin latest-modpack" - sh "git push --set-upstream origin latest-modpack" + sh "git pull -X theirs origin develop" + sh "git push --set-upstream origin develop" } } }