Update Jenkinsfile.
This commit is contained in:
parent
ad7043d33b
commit
675f8bd7e4
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -41,7 +41,7 @@ pipeline {
|
|||||||
sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'"
|
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 develop"
|
sh returnStatus: true, "git push --set-upstream origin develop"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user