Updated Jenkinsfile.
This commit is contained in:
parent
3c87d3b8a8
commit
4e234fa43e
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -38,7 +38,7 @@ pipeline {
|
|||||||
sh "git clean -dfX"
|
sh "git clean -dfX"
|
||||||
sh "git add mods/**"
|
sh "git add mods/**"
|
||||||
sh "git add config/**"
|
sh "git add config/**"
|
||||||
sh "git commit -m 'Automatic integration of latest modpack.' && exit 0"
|
sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'"
|
||||||
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
|
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
|
||||||
sh "git pull -X theirs origin develop"
|
sh "git pull -X theirs origin develop"
|
||||||
sh "git push --set-upstream origin origin/develop"
|
sh "git push --set-upstream origin origin/develop"
|
||||||
|
Loading…
Reference in New Issue
Block a user