Updated Jenkinsfile.
This commit is contained in:
parent
8bbec1a94f
commit
88d3ada2fe
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -35,7 +35,7 @@ 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"
|
||||
sh "git pull -X theirs origin latest-modpack"
|
||||
sh "git push --set-upstream origin latest-modpack"
|
||||
}
|
||||
sh "git checkout develop"
|
||||
|
Loading…
x
Reference in New Issue
Block a user