Updated Jenkinsfile.

This commit is contained in:
Harrison Deng 2022-05-13 01:58:36 -05:00
parent 0cf95dbd77
commit 59741ad3db

2
Jenkinsfile vendored
View File

@ -6,7 +6,7 @@ pipeline {
branch '**/develop'
}
steps {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) {
sh "git fetch"
sh "git checkout -B latest-modpack"
sh "git merge -X theirs origin/develop"