Updated Jenkinsfile.

This commit is contained in:
Harrison Deng 2022-05-12 14:38:00 -05:00
parent 8d00aa9852
commit 3ee2387ddf

2
Jenkinsfile vendored
View File

@ -8,7 +8,7 @@ pipeline {
steps { steps {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git fetch" sh "git fetch"
sh "git checkout -b latest-modpack" sh "git checkout -B latest-modpack"
sh "git merge --strategy-option theirs develop" sh "git merge --strategy-option theirs develop"
sh "chmod u+x ./scripts/*.sh" sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh" sh "./scripts/update_modpack.sh"